Merge pull request #378 from neusdan/warning_fixes

Some trivial compiler and PVS-Studio warning fixes

2 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/stream/rc4/rc4.cpp b/src/lib/stream/rc4/rc4.cpp
index 6146e2818..9a6268b8c 100644
--- a/src/lib/stream/rc4/rc4.cpp
+++ b/src/lib/stream/rc4/rc4.cpp
@@ -111,6 +111,6 @@ void RC4::clear()
 /*
 * RC4 Constructor
 */
-RC4::RC4(size_t s) : SKIP(s), X(0), Y(0) {}
+RC4::RC4(size_t s) : SKIP(s) {}
 
 }
diff --git a/src/lib/stream/rc4/rc4.h b/src/lib/stream/rc4/rc4.h
index 60c9450b4..9c4b2717c 100644
--- a/src/lib/stream/rc4/rc4.h
+++ b/src/lib/stream/rc4/rc4.h
@@ -44,12 +44,11 @@ class BOTAN_DLL RC4 : public StreamCipher
       void generate();
 
       const size_t SKIP;
-
-      byte X, Y;
+      byte X = 0;
+      byte Y = 0;
       secure_vector<byte> state;
-
       secure_vector<byte> buffer;
-      size_t position;
+      size_t position = 0;
    };
 
 }