Added tag 0.2 for changeset 72b98d8bc30e

[awesomized/libmemcached] / lib / memcached_get.c

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index b920df3f4fd55b5162fca8a4ace8c8c24f6cea89..06b406e39f467d5c0ba836240604924021d44624 100644 (file)
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -9,6 +9,13 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
 {
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   char *string_ptr;
+  char *end_ptr;
+
+  assert(value_length);
+  assert(flags);
+  assert(error);
+
+  end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
 
   *value_length= 0;
 
@@ -17,7 +24,7 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
 
   if (*error == MEMCACHED_SUCCESS)
   {
-    char *end_ptr;
+    char *next_ptr;
 
     string_ptr= buffer;
     string_ptr+= 6; /* "VALUE " */
@@ -26,27 +33,45 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
     if (load_key)
     {
       memset(key, 0, MEMCACHED_MAX_KEY);
-      for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++)
+      for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
       {
-        *key= *end_ptr;
+        *key= *string_ptr;
         key++;
       }
     }
     else /* Skip characters */
-      for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
+      for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+
+    if (end_ptr == string_ptr)
+        goto read_error;
+
+    /* Flags fetch move past space */
+    string_ptr++;
+    if (end_ptr == string_ptr)
+        goto read_error;
+
+    for (next_ptr= string_ptr; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+    *flags= (uint16_t)strtol(next_ptr, &string_ptr, 10);
+
+    if (end_ptr == string_ptr)
+        goto read_error;
 
-    /* Flags fetch */
-    string_ptr= end_ptr + 1;
-    for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
-    *flags= (uint16_t)strtol(string_ptr, &end_ptr, 10);
+    /* Length fetch move past space*/
+    string_ptr++;
+    if (end_ptr == string_ptr)
+        goto read_error;
 
-    /* Length fetch */
-    string_ptr= end_ptr + 1;
-    for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
-    *value_length= strtoll(string_ptr, &end_ptr, 10);
+    for (next_ptr= string_ptr; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+    *value_length= (size_t)strtoll(next_ptr, &string_ptr, 10);
+
+    if (end_ptr == string_ptr)
+        goto read_error;
 
     /* Skip past the \r\n */
-    string_ptr= end_ptr +2;
+    string_ptr+= 2;
+
+    if (end_ptr < string_ptr)
+        goto read_error;
 
     if (*value_length)
     {
@@ -65,18 +90,19 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
 
       read_length= read(ptr->hosts[server_key].fd, value, (*value_length)+2);
 
-      if ((read_length -2) != *value_length)
+      if (read_length != (size_t)(*value_length + 2))
       {
         free(value);
-        *error= MEMCACHED_PARTIAL_READ;
-
-        return NULL;
+        goto read_error;
       }
 
       return value;
     }
   }
 
+  return NULL;
+read_error:
+  *error= MEMCACHED_PARTIAL_READ;
   return NULL;
 }
 
@@ -150,6 +176,7 @@ memcached_return memcached_mget(memcached_st *ptr,
     {
       memcached_string_st *string= memcached_string_init(ptr, SMALL_STRING_LEN);
 
+      /* We need to figure out the correct way to error in case of this failure */
       if (!string)
         assert(0);
 
@@ -178,6 +205,7 @@ memcached_return memcached_mget(memcached_st *ptr,
         rc= MEMCACHED_SOME_ERRORS;
       }
       memcached_string_free(ptr, string);
+      cursor_key_exec[x]= NULL; /* Remove warning */
     }
   }
 
@@ -200,6 +228,8 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
     
     if (*error == MEMCACHED_NOTFOUND)
       ptr->cursor_server++;
+    else if (*error != MEMCACHED_SUCCESS)
+      return NULL;
     else
       return value_check;
   }