Fix for connect() to invalidate socket on failure.

[m6w6/libmemcached] / lib / memcached_io.c

diff --git a/lib/memcached_io.c b/lib/memcached_io.c
index 38580638d7f197c81d373373954cb299b8aabc98..299d4390659616b21ebd8a4b4b050dc6df7603ca 100644 (file)
--- a/lib/memcached_io.c
+++ b/lib/memcached_io.c
@@ -83,6 +83,7 @@ ssize_t memcached_io_read(memcached_st *ptr, unsigned  int server_key,
 
   while (length)
   {
+    uint8_t found_eof= 0;
     if (!ptr->hosts[server_key].read_buffer_length)
     {
       size_t data_read;
@@ -118,7 +119,13 @@ ssize_t memcached_io_read(memcached_st *ptr, unsigned  int server_key,
         }
         else if (data_read)
           break;
-        /* If zero, just keep looping */
+        /* If zero, just keep looping unless testing, then assert() */
+        else
+        {
+          WATCHPOINT_ASSERT(0);
+          found_eof= 1;
+          break;
+        }
       }
 
       ptr->hosts[server_key].read_data_length= data_read;
@@ -146,6 +153,9 @@ ssize_t memcached_io_read(memcached_st *ptr, unsigned  int server_key,
       ptr->hosts[server_key].read_buffer_length--;
       buffer_ptr++;
     }
+
+    if (found_eof)
+      break;
   }
 
   return (size_t)(buffer_ptr - buffer);