c++: Fix possible string truncation

[awesomized/libmemcached] / libtest / has.cc

diff --git a/libtest/has.cc b/libtest/has.cc
index b957bc6a49a23ce26e1c46f116985241084101d2..0983f070301f6668f7ae97d5d3a4f8657ae6eded 100644 (file)
--- a/libtest/has.cc
+++ b/libtest/has.cc
@@ -45,13 +45,6 @@ namespace libtest {
 
 bool has_libmemcached_sasl(void)
 {
-#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT)
-  {
-    return true;
-  }
-#endif
-
   return false;
 }
 
@@ -172,7 +165,7 @@ static void initialize_memcached_binary_path()
 
     if (access(arg_buffer.str().c_str(), X_OK) == 0)
     {
-      strncpy(memcached_binary_path, arg_buffer.str().c_str(), FILENAME_MAX);
+      strncpy(memcached_binary_path, arg_buffer.str().c_str(), FILENAME_MAX-1);
     }
   }
 #endif
@@ -192,7 +185,6 @@ bool has_memcached()
 {
   initialize_memcached_binary();
 
-  if (memcached_binary_path[0])
   if (memcached_binary_path[0] and (strlen(memcached_binary_path) > 0))
   {
     return true;
@@ -213,45 +205,6 @@ const char* memcached_binary()
   return NULL;
 }
 
-static char memcached_sasl_binary_path[FILENAME_MAX];
-
-static void initialize_has_memcached_sasl()
-{
-  memcached_sasl_binary_path[0]= 0;
-
-#if defined(MEMCACHED_BINARY) &&  defined(HAVE_MEMCACHED_BINARY) && HAVE_MEMCACHED_BINARY
-  if (HAVE_MEMCACHED_BINARY)
-  {
-    std::stringstream arg_buffer;
-
-    char *getenv_ptr;
-    if (bool((getenv_ptr= getenv("PWD"))) and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
-    {
-      arg_buffer << getenv_ptr;
-      arg_buffer << "/";
-    }
-    arg_buffer << MEMCACHED_BINARY;
-
-    if (access(arg_buffer.str().c_str(), X_OK) == 0)
-    {
-      strncpy(memcached_sasl_binary_path, arg_buffer.str().c_str(), FILENAME_MAX);
-    }
-  }
-#endif
-}
-
-bool has_memcached_sasl()
-{
-  initialize_has_memcached_sasl();
-
-  if (memcached_sasl_binary_path[0] and (strlen(memcached_sasl_binary_path) > 0))
-  {
-    return true;
-  }
-
-  return false;
-}
-
 const char *gearmand_binary() 
 {
 #if defined(GEARMAND_BINARY)