X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_response.c;h=ba0691b504a39590c67184d830e2c1753222cec4;hb=614357baa45cdd7b2d81f80357e5386198db018b;hp=6cb39df62eed4daeff53722d74cf559f5abc6423;hpb=1616df53c3691b05d9aedc9f2c638ac1c2ff78df;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_response.c b/libmemcached/memcached_response.c
index 6cb39df6..ba0691b5 100644
--- a/libmemcached/memcached_response.c
+++ b/libmemcached/memcached_response.c
@@ -237,13 +237,30 @@ static memcached_return textual_read_one_response(memcached_server_st *ptr,
         memcached_server_response_increment(ptr);
         return MEMCACHED_STAT;
       }
-      else if (buffer[1] == 'E')
+      else if (buffer[1] == 'E') /* SERVER_ERROR */ 
 	{
-	  /* SERVER_ERROR */ 
+          char *rel_ptr;
 	  char *startptr= buffer + 13, *endptr= startptr;
+
 	  while (*endptr != '\r' && *endptr != '\n') endptr++;
-	  if (ptr->cached_server_error) ptr->root->call_free(ptr->root, ptr->cached_server_error);
-	  ptr->cached_server_error= ptr->root->call_malloc(ptr->root, endptr - startptr + 1);
+
+          /* 
+            Yes, we could make this "efficent" but to do that we would need
+            to maintain more state for the size of the buffer. Why waste
+            memory in the struct, which is important, for something that
+            rarely should happen?
+          */
+	  rel_ptr= (char *)ptr->root->call_realloc(ptr->root, ptr->cached_server_error, endptr - startptr + 1);
+
+          if (rel_ptr == NULL)
+          {
+            /* If we happened to have some memory, we just null it since we don't know the size */
+            if (ptr->cached_server_error)
+              ptr->cached_server_error[0]= 0;
+            return MEMCACHED_SERVER_ERROR;
+          }
+	  ptr->cached_server_error= rel_ptr;
+
 	  memcpy(ptr->cached_server_error, startptr, endptr - startptr);
 	  ptr->cached_server_error[endptr - startptr]= 0;
 	  return MEMCACHED_SERVER_ERROR;