X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.c;h=34597067b157edcbb818100da12a79061bbbd5d0;hb=b95b86ccfcaf1491760cf84723c48be9f13df49b;hp=f708f8d4ae3d66b17a36fbc3af41096606ded25e;hpb=83607be3d20de2cc96dd588bd418d0e407ffa726;p=awesomized%2Flibmemcached diff --git a/libmemcached/string.c b/libmemcached/string.c index f708f8d4..34597067 100644 --- a/libmemcached/string.c +++ b/libmemcached/string.c @@ -32,7 +32,9 @@ inline static memcached_return_t _string_check(memcached_string_st *string, size new_value= libmemcached_realloc(string->root, string->string, new_size); if (new_value == NULL) + { return MEMCACHED_MEMORY_ALLOCATION_FAILURE; + } string->string= new_value; string->end= string->string + current_offset; @@ -80,7 +82,12 @@ memcached_string_st *memcached_string_create(const memcached_st *memc, memcached rc= _string_check(self, initial_size); if (rc != MEMCACHED_SUCCESS) { + if (rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE) + { + ((memcached_st *)memc)->cached_errno= errno; + } libmemcached_free(memc, self); + return NULL; } @@ -99,7 +106,9 @@ memcached_return_t memcached_string_append_character(memcached_string_st *string rc= _string_check(string, 1); if (rc != MEMCACHED_SUCCESS) + { return rc; + } *string->end= character; string->end++; @@ -115,7 +124,9 @@ memcached_return_t memcached_string_append(memcached_string_st *string, rc= _string_check(string, length); if (rc != MEMCACHED_SUCCESS) + { return rc; + } WATCHPOINT_ASSERT(length <= string->current_size); WATCHPOINT_ASSERT(string->string);