Update yatl.

[awesomized/libmemcached] / libtest / cmdline.cc

diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index 60d2b1a436d4e42e7c0115218ef1befbc3318869..5e723350002cd22f8dbe22d23f64e2b3e3f65f68 100644 (file)
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -766,11 +766,13 @@ std::string Application::arguments()
 {
   std::stringstream arg_buffer;
 
-  for (size_t x= _use_libtool ? 2 : 0;
-       x < _argc and built_argv[x];
-       ++x)
+  // Skip printing out the libtool reference
+  for (size_t x= _use_libtool ? 2 : 0; x < _argc; ++x)
   {
-    arg_buffer << built_argv[x] << " ";
+    if (built_argv[x])
+    {
+      arg_buffer << built_argv[x] << " ";
+    }
   }
 
   return arg_buffer.str();