From 915e23730ed4a603db56170a45d52db167f0f0db Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 30 Jan 2007 06:04:37 +0000 Subject: * 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/branches/ruby_1_8@11597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ string.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ba931add63..e356c15b5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 30 14:58:51 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 12:05:35 2007 Nobuyoshi Nakada * mkconfig.rb: autoconf 2.61 support. [ruby-core:10016] diff --git a/string.c b/string.c index 3261db61ed..08c958d8e4 100644 --- a/string.c +++ b/string.c @@ -1966,7 +1966,6 @@ rb_str_sub_bang(argc, argv, 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; @@ -1982,6 +1981,7 @@ rb_str_sub_bang(argc, argv, str) else { repl = rb_reg_regsub(repl, str, regs); } + rb_str_modify(str); if (OBJ_TAINTED(repl)) tainted = 1; plen = END(0) - BEG(0); if (RSTRING(repl)->len > plen) { -- cgit v1.2.3