Setup for next version (and fixes for util for RPM)

[awesomized/libmemcached] / libmemcached / memcached_fetch.c

diff --git a/libmemcached/memcached_fetch.c b/libmemcached/memcached_fetch.c
index 28e84ed903c6c1dbef622399bda481aab2cc278a..07bfdda92287576ed95d64489a902c62deb2e635 100644 (file)
--- a/libmemcached/memcached_fetch.c
+++ b/libmemcached/memcached_fetch.c
@@ -16,7 +16,7 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
 
   result_buffer= memcached_fetch_result(ptr, result_buffer, error);
 
-  if (*error != MEMCACHED_SUCCESS)
+  if (*error != MEMCACHED_SUCCESS || result_buffer == NULL)
   {
     *value_length= 0;
     return NULL;
@@ -81,7 +81,7 @@ memcached_return memcached_fetch_execute(memcached_st *ptr,
                                          unsigned int number_of_callbacks)
 {
   memcached_result_st *result= &ptr->result;
-  memcached_return rc;
+  memcached_return rc= MEMCACHED_FAILURE;
   unsigned int x;
 
   while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL) {