mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/fiddle/closure.c (dealloc): workaround fix for libffi's
ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d65d2384a6
commit
5422161026
2 changed files with 9 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Jun 13 00:02:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/fiddle/closure.c (dealloc): workaround fix for libffi's
|
||||||
|
ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214]
|
||||||
|
|
||||||
Sat Jun 12 10:02:26 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Sat Jun 12 10:02:26 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* io.c (rb_f_syscall): should check argument string taint before
|
* io.c (rb_f_syscall): should check argument string taint before
|
||||||
|
|
|
@ -14,11 +14,15 @@ static void
|
||||||
dealloc(void * ptr)
|
dealloc(void * ptr)
|
||||||
{
|
{
|
||||||
fiddle_closure * cls = (fiddle_closure *)ptr;
|
fiddle_closure * cls = (fiddle_closure *)ptr;
|
||||||
|
/*
|
||||||
#ifndef MACOSX
|
#ifndef MACOSX
|
||||||
ffi_closure_free(cls->pcl);
|
ffi_closure_free(cls->pcl);
|
||||||
#else
|
#else
|
||||||
|
*/
|
||||||
munmap(cls->pcl, sizeof(cls->pcl));
|
munmap(cls->pcl, sizeof(cls->pcl));
|
||||||
|
/*
|
||||||
#endif
|
#endif
|
||||||
|
*/
|
||||||
xfree(cls->cif);
|
xfree(cls->cif);
|
||||||
if (cls->argv) xfree(cls->argv);
|
if (cls->argv) xfree(cls->argv);
|
||||||
xfree(cls);
|
xfree(cls);
|
||||||
|
|
Loading…
Reference in a new issue