Merge

[awesomized/libmemcached] / libmemcached / result.cc

diff --git a/libmemcached/result.cc b/libmemcached/result.cc
index eb24fa3617c4f35889851be7e154f64d0e60dbe7..1a5095af5c349a921625cfe4c5651ee9e633954b 100644 (file)
--- a/libmemcached/result.cc
+++ b/libmemcached/result.cc
@@ -52,6 +52,7 @@ static inline void _result_init(memcached_result_st *self,
   self->key_length= 0;
   self->item_cas= 0;
   self->root= memc;
+  self->count= 0;
   self->item_key[0]= 0;
 }
 
@@ -100,8 +101,10 @@ void memcached_result_reset(memcached_result_st *ptr)
 
 void memcached_result_free(memcached_result_st *ptr)
 {
-  if (not ptr)
+  if (ptr == NULL)
+  {
     return;
+  }
 
   memcached_string_free(&ptr->value);
 
@@ -112,6 +115,7 @@ void memcached_result_free(memcached_result_st *ptr)
   }
   else
   {
+    ptr->count= 0;
     ptr->options.is_initialized= false;
   }
 }