Merge in bug fix for lp:779837

[m6w6/libmemcached] / libmemcached / allocators.cc

diff --git a/libmemcached/allocators.cc b/libmemcached/allocators.cc
index d0d9e57e8659dfdd0e333ad24e310a128be1d18a..ec491ddbc825d61bb64d6723bcae61d12aa151a3 100644 (file)
--- a/libmemcached/allocators.cc
+++ b/libmemcached/allocators.cc
@@ -39,7 +39,8 @@
 
 void _libmemcached_free(const memcached_st*, void *mem, void*)
 {
-  free(mem);
+  if (mem)
+    free(mem);
 }
 
 void *_libmemcached_malloc(const memcached_st *, size_t size, void *)