aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-01 03:10:02 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-01 03:10:02 +0000
commitdb42bd0448f01a79ddcc522be13b49651118fc82 (patch)
treecec0f24bb7f8bef4bf95c51a4e14bf50a07205ba
parent6280ce3b686c846c17713237e11f12fe182f2e87 (diff)
downloadruby-db42bd0448f01a79ddcc522be13b49651118fc82.tar.gz
* insns.def (concatstrings): don't use initial ASCII-8BIT string.
[ruby-core:38635] [Bug #5126] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--insns.def4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 74b32a4299..9c6bea73da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 1 12:00:35 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * insns.def (concatstrings): don't use initial ASCII-8BIT string.
+ [ruby-core:38635] [Bug #5126]
+
Sun Jul 31 22:57:16 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* enc/Makefile.in (ECHO1): Same as the recent fix in common.mk.
diff --git a/insns.def b/insns.def
index a300189e1d..829918c117 100644
--- a/insns.def
+++ b/insns.def
@@ -392,9 +392,9 @@ concatstrings
(...)
(VALUE val) // inc += 1 - num;
{
- rb_num_t i = num;
+ rb_num_t i = num - 1;
- val = rb_str_new(0, 0);
+ val = rb_str_resurrect(TOPN(i));
while (i-- > 0) {
const VALUE v = TOPN(i);
rb_str_append(val, v);