memcached 1.1.1 → 1.1.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.1.2. Fix memory leak in memcached_mget().
+
 v1.1.1. Speed up multiget. Don't cast types on unmarshalled set.
 
 v1.1. TTL interface requires Fixnums.

data/ext/rlibmemcached.i

@@ -41,19 +41,8 @@
     $1[i] = StringValuePtr(RARRAY_PTR($input)[i]);
   }
 }
-%typemap(in) (char **keys, size_t *key_length, unsigned int number_of_keys) {
-  int i;
-  Check_Type($input, T_ARRAY);
-  $3 = (unsigned int) RARRAY_LEN($input);
-  $2 = (size_t *) malloc(($3+1)*sizeof(size_t));
-  $1 = (char **) malloc(($3+1)*sizeof(char *));
-  for(i = 0; i < $3; i ++) {
-    Check_Type(RARRAY_PTR($input)[i], T_STRING);
-    $2[i] = RSTRING_LEN(RARRAY_PTR($input)[i]);
-    $1[i] = StringValuePtr(RARRAY_PTR($input)[i]);
-  }
-}
-%typemap(freearg) (char **keys, size_t *key_length, size_t number_of_keys) {
+
+%typemap(freearg) (const char **keys, size_t *key_length, size_t number_of_keys) {
    free($1);
    free($2);
 }

data/ext/rlibmemcached_wrap.c

@@ -8849,8 +8849,16 @@ _wrap_memcached_mget(int argc, VALUE *argv, VALUE self) {
   }
   result = (memcached_return)memcached_mget(arg1,(char const **)arg2,arg3,arg4);
   vresult = SWIG_From_int((int)(result));
+  {
+    free(arg2);
+    free(arg3);
+  }
   return vresult;
 fail:
+  {
+    free(arg2);
+    free(arg3);
+  }
   return Qnil;
 }
 
@@ -8896,8 +8904,16 @@ _wrap_memcached_mget_len(int argc, VALUE *argv, VALUE self) {
   arg5 = (uint32_t)(val5);
   result = (memcached_return)memcached_mget_len(arg1,(char const **)arg2,arg3,arg4,arg5);
   vresult = SWIG_From_int((int)(result));
+  {
+    free(arg2);
+    free(arg3);
+  }
   return vresult;
 fail:
+  {
+    free(arg2);
+    free(arg3);
+  }
   return Qnil;
 }
 
@@ -9031,9 +9047,17 @@ _wrap_memcached_mget_by_key(int argc, VALUE *argv, VALUE self) {
   result = (memcached_return)memcached_mget_by_key(arg1,(char const *)arg2,arg3,(char const **)arg4,arg5,arg6,arg7);
   vresult = SWIG_From_int((int)(result));
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    free(arg4);
+    free(arg5);
+  }
   return vresult;
 fail:
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    free(arg4);
+    free(arg5);
+  }
   return Qnil;
 }
 

data/memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2011-02-23}
+  s.date = %q{2011-02-24}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
@@ -17,13 +17,12 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{An interface to the libmemcached C client.}
   s.test_files = ["test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/profile/exercise.rb

@@ -103,7 +103,7 @@ class Worker
         end
       when "multiget"
         @i.times do
-          @cache.get([@key1, @key2])
+          @cache.get([@key1, @key2, @key3])
         end
       when "clone"
         @i.times do

data/test/profile/valgrind.rb

@@ -1,3 +1,3 @@
 require "#{File.dirname(__FILE__)}/../setup"
 
-exec("valgrind  --tool=memcheck --leak-check=full --show-reachable=no --num-callers=15 --track-fds=yes --workaround-gcc296-bugs=yes --max-stackframe=7304328 --dsymutil=yes --track-origins=yes ruby -r#{File.dirname(__FILE__)}/exercise.rb -e \"Worker.new('mixed', 10000, 'true').work\"")
+exec("valgrind --tool=memcheck --error-limit=no --leak-check=full --show-reachable=no --num-callers=15 --track-fds=yes --workaround-gcc296-bugs=yes --max-stackframe=7304328 --dsymutil=yes --track-origins=yes ruby -r#{File.dirname(__FILE__)}/exercise.rb -e \"Worker.new(ENV['TEST'] || 'mixed', 500, 'true').work\"")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Evan Weaver
@@ -36,7 +36,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2011-02-23 00:00:00 -08:00
+date: 2011-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: An interface to the libmemcached C client.