kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/fiddle/closure.c (callback): use rb_ary_tmp_new() instead of

Browse source 
xmalloc() to allocate an array for arguments of callback procedure,
  to prevent arguments from being swept by GC. [ruby-core:38546]
  [Bug #4929]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2011-07-28 14:47:51 +00:00
parent e7e87b3c4e
commit 60053a0a50
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Jul 28 23:36:28 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* 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:36:06 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
* ext/openssl/ossl_cipher.c (ossl_cipher_initialize): Avoid possible

23
ext/fiddle/closure.c
View file

@ -56,7 +56,7 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
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 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
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 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
}
}
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 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
default:
rb_raise(rb_eRuntimeError, "closure retval: %d", type);
}
xfree(params);
}
static VALUE