From 5da4785a2f1821197bfe12acdce3aa97eb2f4e41 Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 9 Aug 2011 15:10:25 +0000 Subject: merge revision(s) 32859: * ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD. [ruby-dev:44337] [Bug #5152] * ext/date/data_parse.c (parse_ddd_cb): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/date/date_parse.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index dbc52b7467..95063cf5a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Aug 9 22:57:45 2011 CHIKANAGA Tomoyuki + + * ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD. + [ruby-dev:44337] [Bug #5152] + + * ext/date/data_parse.c (parse_ddd_cb): ditto. + Tue Aug 9 12:20:33 2011 Naohisa Goto * test/fiddle/helper.rb (libc_so, libm_so): Solaris support added. diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c index 3605ff7f65..9b8ff36838 100644 --- a/ext/date/date_parse.c +++ b/ext/date/date_parse.c @@ -530,6 +530,7 @@ date_zone_to_diff(VALUE str) } } } + RB_GC_GUARD(str); ok: return offset; } @@ -1322,6 +1323,7 @@ parse_ddd_cb(VALUE m, VALUE hash) set_hash("yday", INT2FIX(n2i(cs2, 4, 3))); } break; + RB_GC_GUARD(s2); } if (!NIL_P(s3)) { cs3 = RSTRING_PTR(s3); @@ -1353,6 +1355,7 @@ parse_ddd_cb(VALUE m, VALUE hash) break; } } + RB_GC_GUARD(s3); } if (!NIL_P(s4)) { l4 = RSTRING_LEN(s4); @@ -1391,6 +1394,7 @@ parse_ddd_cb(VALUE m, VALUE hash) *--s1 = '+'; set_hash("offset", date_zone_to_diff(rb_str_new2(s1))); } + RB_GC_GUARD(s5); } return 1; -- cgit v1.2.3