Fixed bug reported by Stuart Midgley about what happens when there are no

[awesomized/libmemcached] / lib / memcached_quit.c

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index d7a42315cc39ae6fe6365925814400f18eae7d0b..20a76e2915e3eb482c9db123f7c289ce4c56fb8a 100644 (file)
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -11,13 +11,22 @@
 
 void memcached_quit_server(memcached_st *ptr, unsigned int server_key)
 {
+  if (ptr->hosts == NULL || 
+      ptr->number_of_hosts == 0 ||
+      server_key > ptr->number_of_hosts)
+    return;
+
   if (ptr->hosts[server_key].fd != -1)
   {
-    if (ptr->flags & MEM_NO_BLOCK)
-      memcached_io_write(ptr, server_key, "quit\r\n", 6, 1);
+    if (ptr->flags & MEM_NO_BLOCK && ptr->hosts[server_key].stack_responses)
+      memcached_io_flush(ptr, server_key);
+
+    memcached_io_write(ptr, server_key, "quit\r\n", 6, 1);
+
     close(ptr->hosts[server_key].fd);
     ptr->hosts[server_key].fd= -1;
     ptr->hosts[server_key].stack_responses= 0;
+    ptr->hosts[server_key].cursor_active= 0;
   }
 
   ptr->connected--;
@@ -27,7 +36,7 @@ void memcached_quit(memcached_st *ptr)
 {
   unsigned int x;
 
-  if (ptr->hosts)
+  if (ptr->hosts && ptr->number_of_hosts)
   {
     for (x= 0; x < ptr->number_of_hosts; x++)
       memcached_quit_server(ptr, x);