Update for virtual buckets/wasn't this just originally the wheel?

[awesomized/libmemcached] / libmemcached / server.c

diff --git a/libmemcached/server.c b/libmemcached/server.c
index 3e5e77a5795cc29b10d8287fb8260a73a6da1cf1..97b0b27c865ccdd2faf1f5728507c75a8b5dfd98 100644 (file)
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -32,9 +32,9 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r
   self->state.is_dead= false;
   WATCHPOINT_SET(self->io_wait_count.read= 0);
   WATCHPOINT_SET(self->io_wait_count.write= 0);
-  self->major_version= 0;
-  self->micro_version= 0;
-  self->minor_version= 0;
+  self->major_version= UINT8_MAX;
+  self->micro_version= UINT8_MAX;
+  self->minor_version= UINT8_MAX;
   self->type= type;
   self->read_ptr= self->read_buffer;
   self->cached_server_error= NULL;
@@ -115,7 +115,14 @@ void memcached_server_free(memcached_server_st *self)
 
   if (memcached_is_allocated(self))
   {
-    libmemcached_free(self->root, self);
+    if (self->root)
+    {
+      libmemcached_free(self->root, self);
+    }
+    else
+    {
+      free(self);
+    }
   }
   else
   {