X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.cc;h=a94d442111da9abd37e8ed1fbba4cb0373b464a9;hb=9169cee9ec0f231b3117a0d5a7840d2067f29610;hp=75641ccdd0e47796fbd89e536301aeffd96eb447;hpb=f34725871a4ad46ea3b3194d829eebf81cc5c08e;p=m6w6%2Flibmemcached diff --git a/libmemcached/string.cc b/libmemcached/string.cc index 75641ccd..a94d4421 100644 --- a/libmemcached/string.cc +++ b/libmemcached/string.cc @@ -43,7 +43,6 @@ inline static memcached_return_t _string_check(memcached_string_st *string, size if (need && need > (size_t)(string->current_size - (size_t)(string->end - string->string))) { size_t current_offset= (size_t) (string->end - string->string); - char *new_value; size_t adjust; size_t new_size; @@ -56,9 +55,9 @@ inline static memcached_return_t _string_check(memcached_string_st *string, size if (new_size < need) return memcached_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); - new_value= static_cast(libmemcached_realloc(string->root, string->string, new_size, sizeof(char))); + char *new_value= libmemcached_xrealloc(string->root, string->string, new_size, char); - if (not new_value) + if (new_value == NULL) { return memcached_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); }