[前][次][番号順一覧][スレッド一覧]

ruby-changes:16328

From: naruse <ko1@a...>
Date: Sun, 13 Jun 2010 00:28:57 +0900 (JST)
Subject: [ruby-changes:16328] Ruby:r28300 (trunk): * ext/fiddle/closure.c (dealloc): workaround fix for libffi's

naruse	2010-06-13 00:28:40 +0900 (Sun, 13 Jun 2010)

  New Revision: 28300

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

  Log:
    * ext/fiddle/closure.c (dealloc): workaround fix for libffi's
      ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214]

  Modified files:
    trunk/ChangeLog
    trunk/ext/fiddle/closure.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28299)
+++ ChangeLog	(revision 28300)
@@ -1,3 +1,8 @@
+Sun Jun 13 00:02:56 2010  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* io.c (rb_f_syscall): should check argument string taint before
Index: ext/fiddle/closure.c
===================================================================
--- ext/fiddle/closure.c	(revision 28299)
+++ ext/fiddle/closure.c	(revision 28300)
@@ -14,11 +14,15 @@
 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);

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

[前][次][番号順一覧][スレッド一覧]