Merged trunk.

[m6w6/libmemcached] / libmemcached / server.c

diff --git a/libmemcached/server.c b/libmemcached/server.c
index 22bd6f54ef4b53f1cb3a53b74cd8047e4e8b009b..97b0b27c865ccdd2faf1f5728507c75a8b5dfd98 100644 (file)
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -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
   {