Merge in all updates.

[awesomized/libmemcached] / libmemcached / memcached.c

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 120c2087b159d12a3f6d998ce1d569c270a27eea..a1999d62dbc78aba69c990c5e2fd50cf23d2c514 100644 (file)
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -121,6 +121,8 @@ static inline bool _memcached_init(memcached_st *self)
 
   self->error_messages= NULL;
   self->prefix_key= NULL;
+  self->configure.initial_pool_size= 1;
+  self->configure.max_pool_size= 1;
   self->configure.filename= NULL;
 
   return true;
@@ -210,8 +212,13 @@ memcached_st *memcached_create(memcached_st *ptr)
 
 memcached_st *memcached_create_with_options(const char *string, size_t length)
 {
-  memcached_st *self= memcached_create(NULL);
+  if (! length || ! string)
+  {
+    errno= EINVAL;
+    return NULL;
+  }
 
+  memcached_st *self= memcached_create(NULL);
   if (! self)
   {
     errno= ENOMEM;
@@ -225,7 +232,6 @@ memcached_st *memcached_create_with_options(const char *string, size_t length)
   {
     rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
   }
-
     
   if (rc != MEMCACHED_SUCCESS)
   {