diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-12 15:28:40 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-12 15:28:40 +0000 |
commit | 5422161026d4b08f94bdfa39f6dcd266696de64c (patch) | |
tree | a42327331347d62f0dbd2298f1ccff8588dce772 | |
parent | d65d2384a6ef555f0eb10c65def1198f01e17e4b (diff) | |
download | ruby-5422161026d4b08f94bdfa39f6dcd266696de64c.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/fiddle/closure.c | 4 |
2 files changed, 9 insertions, 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> * io.c (rb_f_syscall): should check argument string taint before diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c index 2531ef2b48..3dc8eda013 100644 --- a/ext/fiddle/closure.c +++ b/ext/fiddle/closure.c @@ -14,11 +14,15 @@ static void dealloc(void * ptr) { fiddle_closure * cls = (fiddle_closure *)ptr; + /* #ifndef MACOSX ffi_closure_free(cls->pcl); #else + */ munmap(cls->pcl, sizeof(cls->pcl)); + /* #endif + */ xfree(cls->cif); if (cls->argv) xfree(cls->argv); xfree(cls); |