Use StackBuffer.

src/FileMap.h

@@ -23,6 +23,7 @@
 #include <sys/mman.h>
 #include <rct/Serializer.h>
 #include <rct/Rct.h>
+#include <rct/StackBuffer.h>
 #include "Location.h"
 #include <functional>
 
@@ -221,7 +222,7 @@ class FileMap
                 keySize = std::max<size_t>(str.size(), keySize);
             }
             memcpy(out.data() + sizeof(size_t), &keySize, sizeof(keySize));
-            char buf[keySize];
+            StackBuffer<1024> buf(keySize);
             size_t entrySize = keySize;
             if (const size_t size = FixedSize<Value>::value) {
                 entrySize += size;
@@ -232,7 +233,7 @@ class FileMap
             out.reserve(valuesOffset);
             idx = 0;
             for (const auto &pair : map) {
-                memset(buf, 0, sizeof(buf));
+                memset(buf, 0, keySize);
                 const String &str = keys[idx++];
                 memcpy(buf, str.data(), str.size()); // no need to copy the \0 :-)
                 encodePair(buf, keySize, pair.second);

src/rdm.cpp

@@ -250,7 +250,7 @@ int main(int argc, char** argv)
         Path rcfile = Path::home() + ".rdmrc";
         opterr = 0;
 
-        char *originalArgv[argc];
+        StackBuffer<128, char*> originalArgv(argc);
         memcpy(originalArgv, argv, sizeof(originalArgv));
         /* getopt will molest argv by moving pointers around when it sees
          * fit. Their idea of an optional argument is different from ours so we