Merge pull request #179 from tenderlove/rb_apply

use rb_apply so we don't need to maintain two arrays

Author: tenderlove

ext/sqlite3/database.c

@@ -359,22 +359,18 @@ static void set_sqlite3_func_result(sqlite3_context * ctx, VALUE result)
 static void rb_sqlite3_func(sqlite3_context * ctx, int argc, sqlite3_value **argv)
 {
   VALUE callable = (VALUE)sqlite3_user_data(ctx);
-  VALUE * params = NULL;
-  VALUE guard = rb_ary_new2(argc); /* Prevent garbage collection of params during call. */
+  VALUE params = rb_ary_new2(argc);
   VALUE result;
   int i;
 
   if (argc > 0) {
-    params = xcalloc((size_t)argc, sizeof(VALUE *));
     for(i = 0; i < argc; i++) {
       VALUE param = sqlite3val2rb(argv[i]);
-      rb_ary_push(guard, param);
-      params[i] = param;
+      rb_ary_push(params, param);
     }
   }
 
-  result = rb_funcall2(callable, rb_intern("call"), argc, params);
-  xfree(params);
+  result = rb_apply(callable, rb_intern("call"), params);
 
   set_sqlite3_func_result(ctx, result);
 }

test/test_database.rb

@@ -283,8 +283,11 @@ def test_function_gc_segfault
       @db.create_function("bug", -1) { |func, *values| func.result = values.join }
       # With a lot of data and a lot of threads, try to induce a GC segfault.
       params = Array.new(127, "?" * 28000)
-      proc = Proc.new { db.execute("select bug(#{Array.new(params.length, "?").join(",")})", params) }
-      Mutex.new.tap { |m| threads = (0..30).inject([]) { |a| a << Thread.new { m.synchronize { proc.call } } }.each { |thread| thread.join } }
+      proc = Proc.new {
+        db.execute("select bug(#{Array.new(params.length, "?").join(",")})", params)
+      }
+      m = Mutex.new
+      threads = 30.times.map { Thread.new { m.synchronize { proc.call } } }.each(&:join)
     end
 
     def test_function_return_type_round_trip