2 files changed, 4 insertions, 3 deletions
diff --git a/src/stream/arc4/arc4.cpp b/src/stream/arc4/arc4.cpp
index 90f0f0904..97364bd1a 100644
--- a/src/stream/arc4/arc4.cpp
+++ b/src/stream/arc4/arc4.cpp
@@ -97,7 +97,8 @@ void ARC4::clear()
 /*
 * ARC4 Constructor
 */
-ARC4::ARC4(u32bit s) : StreamCipher(1, 256), SKIP(s)
+ARC4::ARC4(u32bit s) : StreamCipher(1, 256), SKIP(s),
+                       state(256), buffer(DEFAULT_BUFFERSIZE)
    {
    clear();
    }
diff --git a/src/stream/arc4/arc4.h b/src/stream/arc4/arc4.h
index 0488783ef..1b8684e75 100644
--- a/src/stream/arc4/arc4.h
+++ b/src/stream/arc4/arc4.h
@@ -38,8 +38,8 @@ class BOTAN_DLL ARC4 : public StreamCipher
 
       const u32bit SKIP;
 
-      SecureVector<byte, DEFAULT_BUFFERSIZE> buffer;
-      SecureVector<u32bit, 256> state;
+      SecureVector<u32bit> state;
+      SecureVector<byte> buffer;
       u32bit X, Y, position;
    };