diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | transcode.c | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Fri Jul 31 13:15:27 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * transcode.c (str_encode_bang): C99ism. + Fri Jul 31 11:48:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * compile.c (iseq_compile_each): used more appropriate construct. diff --git a/transcode.c b/transcode.c index 9e4c8392c6..4182893928 100644 --- a/transcode.c +++ b/transcode.c @@ -2644,12 +2644,15 @@ str_encode_associate(VALUE str, int encidx) static VALUE str_encode_bang(int argc, VALUE *argv, VALUE str) { + VALUE newstr; + int encidx; + if (OBJ_FROZEN(str)) { /* in future, may use str_frozen_check from string.c, but that's currently static */ rb_raise(rb_eRuntimeError, "string frozen"); } - VALUE newstr = str; - int encidx = str_transcode(argc, argv, &newstr); + newstr = str; + encidx = str_transcode(argc, argv, &newstr); if (encidx < 0) return str; rb_str_shared_replace(str, newstr); |