Merge trunk.

[awesomized/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index 955e1b30a248e414752663320cc00368a5cb7e16..eda7f847a9c648375c3359b93c6d2a3ca9e2f9f9 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -39,7 +39,6 @@
   This is a partial implementation for fetching/creating memcached_server_st objects.
 */
 #include <libmemcached/common.h>
-#include <cassert>
 
 static inline void _server_init(memcached_server_st *self, memcached_st *root,
                                 const char *hostname, in_port_t port,
@@ -141,6 +140,7 @@ void __server_free(memcached_server_st *self)
   if (self->address_info)
   {
     freeaddrinfo(self->address_info);
+    self->address_info= NULL;
   }
 
   memcached_error_free(*self);