X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_string.c;h=30d8e1754bd767f2ed495e5b48734baec66f5a96;hb=03f069ae2f50dd6de7ee5f466b0101cccbea4293;hp=5b2b9d5082b59e3f62b2d641bc3db0e708ea6c61;hpb=3e08799c9d80873a66e7e0b08c6524b0d5c47c28;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_string.c b/lib/memcached_string.c
index 5b2b9d50..30d8e175 100644
--- a/lib/memcached_string.c
+++ b/lib/memcached_string.c
@@ -1,41 +1,62 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_string_check(memcached_string_st *string, size_t need)
 {
-  if (need > (string->current_size - (string->end - string->string)))
+  if (need > (size_t)(string->current_size - (size_t)(string->end - string->string)))
   {
     size_t current_offset= string->end - string->string;
     char *new_value;
+    size_t adjust;
+    size_t new_size;
 
-    new_value= (char *)realloc(string->string, sizeof(char) * string->block_size);
+    /* This is the block multiplier. To keep it larger and surive division errors we must round it up */
+    adjust= (need - (size_t)(string->current_size - (size_t)(string->end - string->string))) / string->block_size;
+    adjust++;
 
-    if (!new_value)
+    new_size= sizeof(char) * (size_t)((adjust * string->block_size) + string->current_size);
+    /* Test for overflow */
+    if (new_size < need)
+      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
+    new_value= (char *)realloc(string->string, new_size);
+
+    if (new_value == NULL)
       return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
 
     string->string= new_value;
     string->end= string->string + current_offset;
 
-    string->current_size+= string->block_size;
+    string->current_size+= (string->block_size * adjust);
 
     /* We zero the block structure we just realloced */
-    memset((string + string->current_size) - string->block_size , 0, 
+    memset((string->string + current_offset), 0, 
            sizeof(char) * string->block_size);
   }
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_string_st *memcached_string_init(memcached_st *ptr, size_t initial_size)
+memcached_string_st *memcached_string_create(memcached_st *ptr, size_t initial_size)
 {
+  memcached_return rc;
   memcached_string_st *string;
 
   /* Saving malloc calls :) */
-  string= (memcached_string_st *)malloc(sizeof(memcached_string_st) + (sizeof(char) * initial_size));
+  string= (memcached_string_st *)malloc(sizeof(memcached_string_st));
   if (!string)
     return NULL;
+  string->end= string->string;
   memset(string, 0, sizeof(memcached_string_st));
   string->block_size= initial_size;
-  memcached_string_check(string, initial_size);
+
+  rc=  memcached_string_check(string, initial_size);
+  if (rc != MEMCACHED_SUCCESS)
+  {
+    free(string);
+    return NULL;
+  }
+
+  WATCHPOINT_ASSERT(string->string == string->end);
 
   return string;
 }
@@ -44,7 +65,13 @@ memcached_return memcached_string_append_character(memcached_st *ptr,
                                                    memcached_string_st *string, 
                                                    char character)
 {
-  memcached_string_check(string, 1);
+  memcached_return rc;
+
+  rc=  memcached_string_check(string, 1);
+
+  if (rc != MEMCACHED_SUCCESS)
+    return rc;
+
   *string->end= ' ';
   string->end++;
 
@@ -54,25 +81,23 @@ memcached_return memcached_string_append_character(memcached_st *ptr,
 memcached_return memcached_string_append(memcached_st *ptr, memcached_string_st *string,
                                          char *value, size_t length)
 {
-  memcached_string_check(string, length);
+  memcached_return rc;
+
+  rc= memcached_string_check(string, length);
+
+  if (rc != MEMCACHED_SUCCESS)
+    return rc;
+
+  WATCHPOINT_ASSERT(length <= string->current_size);
+  WATCHPOINT_ASSERT(string->string);
+  WATCHPOINT_ASSERT(string->end >= string->string);
+
   memcpy(string->end, value, length);
   string->end+= length;
 
   return MEMCACHED_SUCCESS;
 }
 
-#ifdef CRAP
-size_t memcached_string_length(memcached_st *ptr, memcached_string_st *string)
-{
-  return (size_t)(string->end - string->string);
-}
-
-size_t memcached_string_size(memcached_st *ptr, memcached_string_st *string)
-{
-  return string->current_size;
-}
-#endif
-
 size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *string, size_t remove)
 {
   if (string->end - string->string  > remove)