From 69e9b27a28d76f01c8e508af96be5cc218e30a72 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 6 Jul 2014 23:47:17 +0000 Subject: string.c: do not use garbage object * string.c (fstr_update_callback): should not access garbage object contents, copy from the argument instead. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 1a46f467ad..552af5c678 100644 --- a/string.c +++ b/string.c @@ -194,6 +194,7 @@ fstr_update_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existi * at next time */ if (rb_objspace_garbage_object_p(str)) { + str = *fstr; goto create_new_fstr; } @@ -219,7 +220,6 @@ fstr_update_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existi VALUE rb_fstring(VALUE str) { - VALUE fstr = Qnil; Check_Type(str, T_STRING); if (!frozen_strings) @@ -228,8 +228,8 @@ rb_fstring(VALUE str) if (FL_TEST(str, RSTRING_FSTR)) return str; - st_update(frozen_strings, (st_data_t)str, fstr_update_callback, (st_data_t)&fstr); - return fstr; + st_update(frozen_strings, (st_data_t)str, fstr_update_callback, (st_data_t)&str); + return str; } static VALUE -- cgit v1.2.3