nagachika	2014-06-03 00:48:24 +0900 (Tue, 03 Jun 2014)

  New Revision: 46319

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

  Log:
    merge revision(s) r45302: [Backport #9616]
    
    * class.c (rb_class_subclass_add): use xmalloc
    
    * class.c (rb_module_add_to_subclasses_list): ditto
    
    * class.c (rb_class_remove_from_super_subclasses): use xfree
    
    * class.c (rb_class_remove_from_module_subclasses): ditto
      [Bug #9616]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/class.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46318)
+++ ruby_2_1/ChangeLog	(revision 46319)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Jun  3 00:38:33 2014  Eric Wong  <e@8...>
+
+	* class.c (rb_class_subclass_add): use xmalloc
+	* class.c (rb_module_add_to_subclasses_list): ditto
+	* class.c (rb_class_remove_from_super_subclasses): use xfree
+	* class.c (rb_class_remove_from_module_subclasses): ditto
+	  [Bug #9616]
+
 Mon Jun  2 02:19:30 2014  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_accept, open_ifs_socket, socketpair_internal):
Index: ruby_2_1/class.c
===================================================================
--- ruby_2_1/class.c	(revision 46318)
+++ ruby_2_1/class.c	(revision 46319)
@@ -42,7 +42,7 @@ rb_class_subclass_add(VALUE super, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_1/class.c#L42
     rb_subclass_entry_t *entry, *head;
 
     if (super && super != Qundef) {
-	entry = malloc(sizeof(*entry));
+	entry = xmalloc(sizeof(*entry));
 	entry->klass = klass;
 	entry->next = NULL;
 
@@ -62,7 +62,7 @@ rb_module_add_to_subclasses_list(VALUE m https://github.com/ruby/ruby/blob/trunk/ruby_2_1/class.c#L62
 {
     rb_subclass_entry_t *entry, *head;
 
-    entry = malloc(sizeof(*entry));
+    entry = xmalloc(sizeof(*entry));
     entry->klass = iclass;
     entry->next = NULL;
 
@@ -88,7 +88,7 @@ rb_class_remove_from_super_subclasses(VA https://github.com/ruby/ruby/blob/trunk/ruby_2_1/class.c#L88
 	if (entry->next) {
 	    RCLASS_EXT(entry->next->klass)->parent_subclasses = RCLASS_EXT(klass)->parent_subclasses;
 	}
-	free(entry);
+	xfree(entry);
     }
 
     RCLASS_EXT(klass)->parent_subclasses = NULL;
@@ -107,7 +107,7 @@ rb_class_remove_from_module_subclasses(V https://github.com/ruby/ruby/blob/trunk/ruby_2_1/class.c#L107
 	    RCLASS_EXT(entry->next->klass)->module_subclasses = RCLASS_EXT(klass)->module_subclasses;
 	}
 
-	free(entry);
+	xfree(entry);
     }
 
     RCLASS_EXT(klass)->module_subclasses = NULL;
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46318)
+++ ruby_2_1/version.h	(revision 46319)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-06-02"
-#define RUBY_PATCHLEVEL 122
+#define RUBY_RELEASE_DATE "2014-06-03"
+#define RUBY_PATCHLEVEL 123
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 3
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45302


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