From eb25ce7382b57a5bed1c0b99a71ce5edd234e933 Mon Sep 17 00:00:00 2001 From: ngoto Date: Fri, 15 Jul 2016 12:35:52 +0000 Subject: * string.c (str_buf_cat): Fix capa size for embed string. Fix bug in r55547. [Bug #12536] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cc38589662..16b297f251 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 15 21:30:38 2016 Naohisa Goto + + * string.c (str_buf_cat): Fix capa size for embed string. + Fix bug in r55547. [Bug #12536] + Fri Jul 15 18:13:15 2016 SHIBATA Hiroshi * gems/bundled_gems: update latest gems. diff --git a/string.c b/string.c index 4bc4ebfd99..514488fd93 100644 --- a/string.c +++ b/string.c @@ -2570,7 +2570,7 @@ str_buf_cat(VALUE str, const char *ptr, long len) rb_str_modify(str); if (len == 0) return 0; if (STR_EMBED_P(str)) { - capa = RSTRING_EMBED_LEN_MAX + termlen - 1; + capa = RSTRING_EMBED_LEN_MAX + 1 - termlen; sptr = RSTRING(str)->as.ary; olen = RSTRING_EMBED_LEN(str); } -- cgit v1.2.3