X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fdrizzled.cc;h=16933c4bdab08e09a0573c5b8b629223e437f0c8;hb=20ac79fc8f8999f39b4fb33e55d4a205ce0c9a10;hp=3653eea245010016404e4bf3513d28009ac2b711;hpb=23dca174eef8d846e3d4402729b57f6ded035e64;p=awesomized%2Flibmemcached

diff --git a/libtest/drizzled.cc b/libtest/drizzled.cc
index 3653eea2..16933c4b 100644
--- a/libtest/drizzled.cc
+++ b/libtest/drizzled.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 
 #include <libtest/drizzled.h>
@@ -182,9 +182,10 @@ public:
   {
     if (arg > 0)
     {
-      char buffer[1024];
-      snprintf(buffer, sizeof(buffer), "--drizzle-protocol.port=%d", int(arg));
-      app.add_option(buffer);
+      libtest::vchar_t buffer;
+      buffer.resize(1024);
+      snprintf(&buffer[1024], buffer.size(), "--drizzle-protocol.port=%d", int(arg));
+      app.add_option(&buffer[1024]);
     }
   }
 
@@ -205,6 +206,11 @@ bool Drizzle::build(size_t argc, const char *argv[])
 
   for (size_t x= 0 ; x < argc ; x++)
   {
+    if (argv[x] == NULL)
+    {
+      break;
+    }
+
     add_option(argv[x]);
   }