X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=77bc68aa60df63a1f78a213263121cb3d2e714c6;hb=e69bb33d8da40ded7f7a58a321b9f220b6651c8c;hp=aa50d70bcf0423e7e6d6bc7e68b109b2c7649d8e;hpb=151506dd4b5da014f23438226ee286772a78dfd3;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index aa50d70b..77bc68aa 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -113,6 +113,8 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
       return value;
     }
   }
+  else if (*error == MEMCACHED_END)
+    *error= MEMCACHED_NOTFOUND;
 
   return NULL;
 read_error:
@@ -129,41 +131,57 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
   char *value;
-  memcached_return rc;
   LIBMEMCACHED_MEMCACHED_GET_START();
 
   *value_length= 0;
   *error= memcached_connect(ptr);
 
   if (*error != MEMCACHED_SUCCESS)
-    return NULL;
+    goto error;
 
   server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
 
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
                         (int)key_length, key);
-  if (*error != MEMCACHED_SUCCESS)
-    return NULL;
-
   if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
   {
     *error= MEMCACHED_WRITE_FAILURE;
-    return NULL;
+    goto error;
   }
 
   value= memcached_value_fetch(ptr, key, &key_length, value_length, flags,
                                error, 0, server_key);
-  /* We need to read END */
-  rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
-  if (rc != MEMCACHED_NOTFOUND)
+  if (*error == MEMCACHED_END && *value_length == 0)
+  {
+    *error= MEMCACHED_NOTFOUND;
+    goto error;
+  }
+  else if (*error == MEMCACHED_SUCCESS)
   {
-    free(value);
-    *value_length= 0;
-    *error= MEMCACHED_PROTOCOL_ERROR;
+    memcached_return rc;
+    /* We need to read END */
+    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+
+    if (rc != MEMCACHED_END)
+    {
+      *error= MEMCACHED_PROTOCOL_ERROR;
+      goto error;
+    }
   }
+  else 
+      goto error;
+
   LIBMEMCACHED_MEMCACHED_GET_END();
 
   return value;
+
+error:
+  free(value);
+  *value_length= 0;
+
+  LIBMEMCACHED_MEMCACHED_GET_END();
+
+    return NULL;
 }
 
 memcached_return memcached_mget(memcached_st *ptr,