libmemcached-1.0: fix subscripting on empty vector

[awesomized/libmemcached] / util / instance.cc

diff --git a/util/instance.cc b/util/instance.cc
index e96f414f72e6280ba899414496b81ce376c3c5ac..1b99739762d40e158b63a41a0c70688ca58503f9 100644 (file)
--- a/util/instance.cc
+++ b/util/instance.cc
@@ -36,7 +36,7 @@
  */
 
 
-#include <config.h>
+#include "mem_config.h"
 
 #include "util/instance.hpp"
 
@@ -50,7 +50,23 @@
 #include <sys/types.h>
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
+#endif
+
+#ifndef INVALID_SOCKET
+# define INVALID_SOCKET -1
+#endif
+
+#ifndef SOCKET_ERROR
+# define SOCKET_ERROR -1
+#endif
+
+#ifndef get_socket_errno
+# define get_socket_errno() errno
+#endif
+
+#ifndef closesocket
+# define closesocket(a) close(a)
 #endif
 
 
@@ -211,7 +227,6 @@ bool Instance::run()
     case READING:
       if (operation->has_response())
       {
-        size_t total_read;
         ssize_t read_length;
 
         do
@@ -240,7 +255,6 @@ bool Instance::run()
           }
 
           operation->push(buffer, static_cast<size_t>(read_length));
-          total_read+= static_cast<size_t>(read_length);
 
         } while (more_to_read());
       } // end has_response