nagachika	2011-07-29 00:00:58 +0900 (Fri, 29 Jul 2011)

  New Revision: 32726

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32726

  Log:
    merge revision 32725:
    
            * ext/fiddle/closure.c (callback): use rb_ary_tmp_new() instead of
              xmalloc() to allocate an array for arguments of callback procedure,
              to prevent arguments from being swept by GC. [ruby-core:38546]
              [Bug #4929]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/fiddle/closure.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32725)
+++ ruby_1_9_3/ChangeLog	(revision 32726)
@@ -1,3 +1,10 @@
+Thu Jul 28 23:36:28 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* ext/fiddle/closure.c (callback): use rb_ary_tmp_new() instead of
+	  xmalloc() to allocate an array for arguments of callback procedure,
+	  to prevent arguments from being swept by GC. [ruby-core:38546]
+	  [Bug #4929]
+
 Thu Jul 28 22:51:27 2011  Hiroshi Nakamura  <nahi@r...>
 
 	* backport r32723 from trunk.
Index: ruby_1_9_3/ext/fiddle/closure.c
===================================================================
--- ruby_1_9_3/ext/fiddle/closure.c	(revision 32725)
+++ ruby_1_9_3/ext/fiddle/closure.c	(revision 32726)
@@ -56,7 +56,7 @@
     VALUE rbargs    = rb_iv_get(self, "@args");
     VALUE ctype     = rb_iv_get(self, "@ctype");
     int argc        = RARRAY_LENINT(rbargs);
-    VALUE *params   = xcalloc(argc, sizeof(VALUE *));
+    VALUE params    = rb_ary_tmp_new(argc);
     VALUE ret;
     VALUE cPointer;
     int i, type;
@@ -70,27 +70,28 @@
 	    argc = 0;
 	    break;
 	  case TYPE_INT:
-	    params[i] = INT2NUM(*(int *)args[i]);
+	    rb_ary_push(params, INT2NUM(*(int *)args[i]));
 	    break;
 	  case TYPE_VOIDP:
-            params[i] = rb_funcall(cPointer, rb_intern("[]"), 1,
-              PTR2NUM(*(void **)args[i]));
+	    rb_ary_push(params,
+			rb_funcall(cPointer, rb_intern("[]"), 1,
+				   PTR2NUM(*(void **)args[i])));
 	    break;
 	  case TYPE_LONG:
-	    params[i] = LONG2NUM(*(long *)args[i]);
+	    rb_ary_push(params, LONG2NUM(*(long *)args[i]));
 	    break;
 	  case TYPE_CHAR:
-	    params[i] = INT2NUM(*(char *)args[i]);
+	    rb_ary_push(params, INT2NUM(*(char *)args[i]));
 	    break;
 	  case TYPE_DOUBLE:
-	    params[i] = rb_float_new(*(double *)args[i]);
+	    rb_ary_push(params, rb_float_new(*(double *)args[i]));
 	    break;
 	  case TYPE_FLOAT:
-	    params[i] = rb_float_new(*(float *)args[i]);
+	    rb_ary_push(params, rb_float_new(*(float *)args[i]));
 	    break;
 #if HAVE_LONG_LONG
 	  case TYPE_LONG_LONG:
-	    params[i] = rb_ull2inum(*(unsigned LONG_LONG *)args[i]);
+	    rb_ary_push(params, rb_ull2inum(*(unsigned LONG_LONG *)args[i]));
 	    break;
 #endif
 	  default:
@@ -98,7 +99,8 @@
         }
     }
 
-    ret = rb_funcall2(self, rb_intern("call"), argc, params);
+    ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_PTR(params));
+    RB_GC_GUARD(params);
 
     type = NUM2INT(ctype);
     switch (type) {
@@ -130,7 +132,6 @@
       default:
 	rb_raise(rb_eRuntimeError, "closure retval: %d", type);
     }
-    xfree(params);
 }
 
 static VALUE

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/