naruse	2014-02-22 16:50:05 +0900 (Sat, 22 Feb 2014)

  New Revision: 45122

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

  Log:
    merge revision(s) 44731,44751: [Backport #8978]
    
    * ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
      [ruby-core:57599] [Bug #8978].  Thanks mame!
    
    * ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
      [ruby-core:57599] [Bug #8978].

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/fiddle/closure.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45121)
+++ ruby_2_1/ChangeLog	(revision 45122)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 16:34:12 2014  Yusuke Endoh  <mame@t...>
+
+	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
+	  [ruby-core:57599] [Bug #8978].
+
+Sat Feb 22 16:34:12 2014  Aaron Patterson <aaron@t...>
+
+	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
+	  [ruby-core:57599] [Bug #8978].  Thanks mame!
+
 Sat Feb 22 16:17:54 2014  Eric Wong  <e@8...>
 
 	* ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error
Index: ruby_2_1/ext/fiddle/closure.c
===================================================================
--- ruby_2_1/ext/fiddle/closure.c	(revision 45121)
+++ ruby_2_1/ext/fiddle/closure.c	(revision 45122)
@@ -27,7 +27,7 @@ dealloc(void * ptr) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/fiddle/closure.c#L27
 #if USE_FFI_CLOSURE_ALLOC
     ffi_closure_free(cls->pcl);
 #else
-    munmap(cls->pcl, sizeof(cls->pcl));
+    munmap(cls->pcl, sizeof(*cls->pcl));
 #endif
     if (cls->argv) xfree(cls->argv);
     xfree(cls);
@@ -234,7 +234,7 @@ initialize(int rbargc, VALUE argv[], VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/fiddle/closure.c#L234
 #else
     result = ffi_prep_closure(pcl, cif, callback, (void *)self);
     cl->code = (void *)pcl;
-    i = mprotect(pcl, sizeof(pcl), PROT_READ | PROT_EXEC);
+    i = mprotect(pcl, sizeof(*pcl), PROT_READ | PROT_EXEC);
     if (i) {
 	rb_sys_fail("mprotect");
     }
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45121)
+++ ruby_2_1/version.h	(revision 45122)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 66
+#define RUBY_PATCHLEVEL 67
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44731,44751


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