Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch

[m6w6/libmemcached] / libtest / socket.cc

diff --git a/libtest/socket.cc b/libtest/socket.cc
index d4ab2970d66c47f1c13f3c27733dd2e2864a0812..832f0c4a945f17b3081708533a58ef473ec35553 100644 (file)
--- a/libtest/socket.cc
+++ b/libtest/socket.cc
@@ -19,15 +19,20 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <config.h>
 #include <libtest/common.h>
 
-static char global_socket[1024];
+static char global_socket[1024]= { 0 };
 
 namespace libtest {
 
 const char *default_socket()
 {
-  assert(global_socket[0]);
+  if (global_socket[0] == 0)
+  {
+    return NULL;
+  }
+
   return global_socket;
 }