memcached 0.17.3 → 0.17.4

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.17.4. Don't segfault on invalid keys in get_multi.
+
 v0.17.3. Compile with -Os. Retry once on Memcached::ClientError.
 
 v0.17.2. Fix realloc bug on Linux that got regressed.

data/ext/extconf.rb

@@ -1,30 +1,26 @@
 require 'mkmf'
+require 'rbconfig'
 
 HERE = File.expand_path(File.dirname(__FILE__))
 BUNDLE = Dir.glob("libmemcached-*.tar.gz").first
 BUNDLE_PATH = BUNDLE.sub(".tar.gz", "")
 
-DARWIN = `uname -sp` == "Darwin i386\n"
-
-# is there a better way to do this?
-archflags = if ENV['ARCHFLAGS']
-  ENV['ARCHFLAGS']
-elsif Config::CONFIG['host_os'] =~ /darwin10\.0\.*/
-  "-arch i386 -arch x86_64"
-elsif Config::CONFIG['host_os'] =~ /darwin/
-  "-arch i386 -arch ppc"
-else
-  archflags = ''
+if ENV['DEBUG']
+  puts "Setting debug flags."
+  $CFLAGS << " -O0 -ggdb -DHAVE_DEBUG"
+  $EXTRA_CONF = " --enable-debug"
 end
 
+$CFLAGS = "#{RbConfig::CONFIG['CFLAGS']} #{$CFLAGS}".split(" ").uniq.join(" ").gsub("$(cflags)", "")
+$LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS}".split(" ").uniq.join(" ").gsub("$(ldflags)", "")
+$CXXFLAGS = " -std=gnu++98"
+$CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
+
 if !ENV["EXTERNAL_LIB"]
   $includes = " -I#{HERE}/include"
   $libraries = " -L#{HERE}/lib"
-
   $CFLAGS = "#{$includes} #{$libraries} #{$CFLAGS}"
   $LDFLAGS = "#{$libraries} #{$LDFLAGS}"
-  $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
-
   $LIBPATH = ["#{HERE}/lib"]
   $DEFLIBPATH = []
 
@@ -40,38 +36,17 @@ if !ENV["EXTERNAL_LIB"]
       puts(cmd = "patch -p1 < libmemcached.patch")
       raise "'#{cmd}' failed" unless system(cmd)
 
-      Dir.chdir(BUNDLE_PATH) do
-        
-        cxxflags = cflags = ldflags = "-fPIC"
-        extraconf = ''
-        
-        # again... is there a better way to do this?
-        if DARWIN
-          cflags = "#{cflags} #{archflags}"
-          cxxflags = "-std=gnu++98 #{cflags}"
-          ldflags = "#{ldflags} #{archflags}"
-          extraconf = '--enable-dtrace --disable-dependency-tracking'
-        end
-                
-        if ENV['DEBUG']
-          puts "Setting debug flags for libmemcached."
-          cflags << " -O0 -ggdb -DHAVE_DEBUG"
-          extraconf << " --enable-debug"
-        else
-          cflags << " -Os"
-        end
+      Dir.chdir(BUNDLE_PATH) do        
+        puts(cmd = "env CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils #{$EXTRA_CONF} 2>&1")
         
-        puts(cmd = "env CFLAGS='#{cflags}' LDFLAGS='#{ldflags}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils #{extraconf} 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
-        puts(cmd = "make CXXFLAGS='#{cxxflags}' || true 2>&1")
+        puts(cmd = "make CXXFLAGS=#{$CXXFLAGS} || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
         puts(cmd = "make install || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
       end
 
-      unless ENV['DEBUG'] or ENV['DEV']
-        system("rm -rf #{BUNDLE_PATH}")
-      end
+      system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
     end
   end
   
@@ -83,22 +58,6 @@ if !ENV["EXTERNAL_LIB"]
   $LIBS << " -lmemcached_gem"
 end
 
-$CFLAGS.gsub! /-O\d/, ''
-
-if ENV['DEBUG']
-  puts "Setting debug flags for gem."
-  $CFLAGS << " -O0 -ggdb -DHAVE_DEBUG"
-else
-  $CFLAGS << " -Os"
-end
-
-if DARWIN
-  $CFLAGS.gsub! /-arch \S+/, ''
-  $CFLAGS << " #{archflags}"
-  $LDFLAGS.gsub! /-arch \S+/, ''
-  $LDFLAGS << " #{archflags}"
-end
-
 if ENV['SWIG']
   puts "Running SWIG."
   puts(cmd = "swig #{$includes} -ruby -autorename rlibmemcached.i")

data/ext/rlibmemcached.i

@@ -34,6 +34,7 @@
   $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]);
   }
@@ -45,6 +46,7 @@
   $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]);
   }

data/ext/rlibmemcached_wrap.c

@@ -8629,6 +8629,7 @@ _wrap_memcached_mget(int argc, VALUE *argv, VALUE self) {
     arg3 = (size_t *) malloc((arg4+1)*sizeof(size_t));
     arg2 = (char **) malloc((arg4+1)*sizeof(char *)); 
     for(i = 0; i < arg4; i ++) {
+      Check_Type(RARRAY_PTR(argv[1])[i], T_STRING);
       arg3[i] = RSTRING_LEN(RARRAY_PTR(argv[1])[i]);
       arg2[i] = StringValuePtr(RARRAY_PTR(argv[1])[i]);
     }
@@ -8746,6 +8747,7 @@ _wrap_memcached_mget_by_key(int argc, VALUE *argv, VALUE self) {
     arg5 = (size_t *) malloc((arg6+1)*sizeof(size_t));
     arg4 = (char **) malloc((arg6+1)*sizeof(char *)); 
     for(i = 0; i < arg6; i ++) {
+      Check_Type(RARRAY_PTR(argv[3])[i], T_STRING);
       arg5[i] = RSTRING_LEN(RARRAY_PTR(argv[3])[i]);
       arg4[i] = StringValuePtr(RARRAY_PTR(argv[3])[i]);
     }

data/lib/memcached/memcached.rb

@@ -409,6 +409,10 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
 
     Lib.memcached_stat_free(@struct, stat_struct)
     stats
+  rescue Memcached::SomeErrorsWereReported => _
+    e = _.class.new("Error getting stats")
+    e.set_backtrace(_.backtrace)
+    raise e
   end
 
   ### Operations helpers

data/memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.17.3"
+  s.version = "0.17.4"
 
   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{2009-09-30}
+  s.date = %q{2009-11-18}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
@@ -17,7 +17,7 @@ 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.4}
+  s.rubygems_version = %q{1.3.5}
   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_test.rb", "test/unit/rails_test.rb"]

data/test/unit/memcached_test.rb

@@ -358,6 +358,12 @@ class MemcachedTest < Test::Unit::TestCase
      )
   end
 
+  def test_get_multi_checks_types
+    assert_raises(TypeError, ArgumentError) do
+      @cache.get([nil])
+    end
+  end
+
   def test_set_and_get_unmarshalled
     @cache.set key, @value
     result = @cache.get key, false
@@ -740,6 +746,11 @@ class MemcachedTest < Test::Unit::TestCase
     assert_instance_of String, stats[:version].first
   end
 
+  def test_missing_stats
+    cache = Memcached.new('localhost:43041')
+    assert_raises(Memcached::SomeErrorsWereReported) { cache.stats }
+  end
+
   # Clone
 
   def test_clone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  version: 0.17.3
+  version: 0.17.4
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-09-30 00:00:00 -07:00
+date: 2009-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: An interface to the libmemcached C client.