X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_string.c;h=247fbe475dd0506794add134d0c15bb47f3096db;hb=9caad97a2b8b11488b2ba3583922864ac3ccbb09;hp=e2f140178f8f44b54b5ed2277474791a41929f9e;hpb=7eb4f57fd1daa46652091414e381f7842833bc6a;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_string.c b/lib/memcached_string.c
index e2f14017..247fbe47 100644
--- a/lib/memcached_string.c
+++ b/lib/memcached_string.c
@@ -2,16 +2,23 @@
 
 memcached_return memcached_string_check(memcached_string_st *string, size_t need)
 {
-  if (need > (size_t)(string->current_size - (size_t)(string->end - string->string)))
+  if (need && 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= (need - (size_t)(string->current_size - (size_t)(string->end - string->string))) / string->block_size;
+    size_t adjust;
+    size_t new_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++;
 
-    new_value= (char *)realloc(string->string, 
-                               sizeof(char) * ((adjust * string->block_size) + string->current_size));
+    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;
@@ -20,27 +27,31 @@ memcached_return memcached_string_check(memcached_string_st *string, size_t need
     string->end= string->string + current_offset;
 
     string->current_size+= (string->block_size * adjust);
-
-    /* We zero the block structure we just realloced */
-    memset((string->string + current_offset), 0, 
-           sizeof(char) * string->block_size);
   }
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_string_st *memcached_string_create(memcached_st *ptr, size_t initial_size)
+memcached_string_st *memcached_string_create(memcached_st *ptr, memcached_string_st *string, size_t initial_size)
 {
   memcached_return rc;
-  memcached_string_st *string;
 
   /* Saving malloc calls :) */
-  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;
+  if (string)
+  {
+    memset(string, 0, sizeof(memcached_string_st));
+    string->is_allocated= MEMCACHED_NOT_ALLOCATED;
+  }
+  else
+  {
+    string= (memcached_string_st *)malloc(sizeof(memcached_string_st));
+    if (!string)
+      return NULL;
+    memset(string, 0, sizeof(memcached_string_st));
+    string->is_allocated= MEMCACHED_ALLOCATED;
+  }
+  string->block_size= MEMCACHED_BLOCK_SIZE;
+  string->root= ptr;
 
   rc=  memcached_string_check(string, initial_size);
   if (rc != MEMCACHED_SUCCESS)
@@ -54,12 +65,13 @@ memcached_string_st *memcached_string_create(memcached_st *ptr, size_t initial_s
   return string;
 }
 
-memcached_return memcached_string_append_character(memcached_st *ptr, 
-                                                   memcached_string_st *string, 
+memcached_return memcached_string_append_character(memcached_string_st *string, 
                                                    char character)
 {
   memcached_return rc;
 
+  WATCHPOINT_ASSERT(string->is_allocated != MEMCACHED_USED);
+
   rc=  memcached_string_check(string, 1);
 
   if (rc != MEMCACHED_SUCCESS)
@@ -71,18 +83,21 @@ memcached_return memcached_string_append_character(memcached_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return memcached_string_append(memcached_st *ptr, memcached_string_st *string,
+memcached_return memcached_string_append(memcached_string_st *string,
                                          char *value, size_t length)
 {
   memcached_return rc;
 
+  WATCHPOINT_ASSERT(string->is_allocated != MEMCACHED_USED);
+
   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 && string->end <= string->string + string->current_size);
+  WATCHPOINT_ASSERT(string->end >= string->string);
 
   memcpy(string->end, value, length);
   string->end+= length;
@@ -90,8 +105,10 @@ memcached_return memcached_string_append(memcached_st *ptr, memcached_string_st
   return MEMCACHED_SUCCESS;
 }
 
-size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *string, size_t remove)
+size_t memcached_string_backspace(memcached_string_st *string, size_t remove)
 {
+  WATCHPOINT_ASSERT(string->is_allocated != MEMCACHED_USED);
+
   if (string->end - string->string  > remove)
   {
     size_t difference;
@@ -106,15 +123,40 @@ size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *string
   return remove;
 }
 
-memcached_return memcached_string_reset(memcached_st *ptr, memcached_string_st *string)
+char *memcached_string_c_copy(memcached_string_st *string)
+{
+  char *c_ptr;
+
+  WATCHPOINT_ASSERT(string->is_allocated != MEMCACHED_USED);
+
+  c_ptr= (char *)malloc((memcached_string_length(string)+1) * sizeof(char));
+  if (!c_ptr)
+    return NULL;
+
+  memcpy(c_ptr, memcached_string_value(string), memcached_string_length(string));
+  c_ptr[memcached_string_length(string)]= 0;
+
+  return c_ptr;
+}
+
+memcached_return memcached_string_reset(memcached_string_st *string)
 {
+  WATCHPOINT_ASSERT(string->is_allocated != MEMCACHED_USED);
   string->end= string->string;
   
   return MEMCACHED_SUCCESS;
 }
 
-void memcached_string_free(memcached_st *ptr, memcached_string_st *string)
+void memcached_string_free(memcached_string_st *ptr)
 {
-  free(string->string);
-  free(string);
+  if (ptr == NULL)
+    return;
+
+  if (ptr->string)
+    free(ptr->string);
+
+  if (ptr->is_allocated == MEMCACHED_ALLOCATED)
+    free(ptr);
+  else
+    ptr->is_allocated= MEMCACHED_USED;
 }