nagachika	2014-05-05 00:55:30 +0900 (Mon, 05 May 2014)

  New Revision: 45815

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

  Log:
    merge revision(s) r45015: [Backport #9657]
    
    * ext/bigdecimal/bigdecimal.c (BigDecimal_initialize): Insert GC guard.
    
    * ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): ditto.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/bigdecimal/bigdecimal.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45814)
+++ ruby_2_1/ChangeLog	(revision 45815)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon May  5 00:52:18 2014  Kenta Murata  <mrkn@m...>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_initialize): Insert GC guard.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): ditto.
+
 Mon May  5 00:42:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* ext/psych/psych.gemspec: update gemspec for psych-2.0.5
Index: ruby_2_1/ext/bigdecimal/bigdecimal.c
===================================================================
--- ruby_2_1/ext/bigdecimal/bigdecimal.c	(revision 45814)
+++ ruby_2_1/ext/bigdecimal/bigdecimal.c	(revision 45815)
@@ -2456,9 +2456,11 @@ static Real *BigDecimal_new(int argc, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/bigdecimal.c#L2456
 static VALUE
 BigDecimal_initialize(int argc, VALUE *argv, VALUE self)
 {
+    ENTER(1);
     Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
-    Real *x = BigDecimal_new(argc, argv);
+    Real *x;
 
+    GUARD_OBJ(x, BigDecimal_new(argc, argv));
     if (ToValue(x)) {
 	pv = VpCopy(pv, x);
     }
@@ -2539,7 +2541,10 @@ BigDecimal_new(int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/bigdecimal.c#L2541
 static VALUE
 BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
 {
-    Real *pv = BigDecimal_new(argc, argv);
+    ENTER(1);
+    Real *pv;
+
+    GUARD_OBJ(pv, BigDecimal_new(argc, argv));
     if (ToValue(pv)) pv = VpCopy(NULL, pv);
     pv->obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, pv);
     return pv->obj;
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45814)
+++ ruby_2_1/version.h	(revision 45815)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-05-05"
-#define RUBY_PATCHLEVEL 86
+#define RUBY_PATCHLEVEL 87
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5

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


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