From 2fc900dac88f5023afde41ad5a4f3d7f011f60a8 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 30 Jan 2007 08:02:30 +0000 Subject: [PATCH] * string.c (rb_str_sub_bang): calling rb_str_modify() should be just before actually modifying the string. fixed: [ruby-dev:30211] (originally reported by zunda) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ string.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cdd3fec293..5596eed304 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 30 17:01:21 2007 NAKAMURA Usaku + + * string.c (rb_str_sub_bang): calling rb_str_modify() should be just + before actually modifying the string. + fixed: [ruby-dev:30211] (originally reported by zunda) + Tue Jan 30 13:24:06 2007 Yukihiro Matsumoto * numeric.c (int_pred): add Integer#pred corresponding diff --git a/string.c b/string.c index 7a5c7b45a3..7a27af8d77 100644 --- a/string.c +++ b/string.c @@ -2027,7 +2027,6 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str) pat = get_pat(argv[0], 1); if (rb_reg_search(pat, str, 0, 0) >= 0) { - rb_str_modify(str); match = rb_backref_get(); regs = RMATCH(match)->regs; @@ -2043,6 +2042,7 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str) else { repl = rb_reg_regsub(repl, str, regs, pat); } + rb_str_modify(str); if (OBJ_TAINTED(repl)) tainted = 1; plen = END(0) - BEG(0); if (RSTRING_LEN(repl) > plen) {