From 6f65a0ebf28ae362f99e0b38473b9105a4c5093d Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 29 Jul 2015 07:00:25 +0000 Subject: string.c: empty non-embed case * string.c (str_buf_cat): consider empty non-embed string case, not to loop infinitely. [ruby-core:70074] [Bug #11383] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 0a8f4e1d9c..026ebd7147 100644 --- a/string.c +++ b/string.c @@ -2292,12 +2292,17 @@ str_buf_cat(VALUE str, const char *ptr, long len) } total = olen + len; if (capa <= total) { - while (total > capa) { - if (capa > LONG_MAX / 2) { - capa = (total + 4095) / 4096 * 4096; - break; + if (LIKELY(capa > 0)) { + while (total > capa) { + if (capa > LONG_MAX / 2) { + capa = (total + 4095) / 4096 * 4096; + break; + } + capa = 2 * capa; } - capa = 2 * capa; + } + else { + capa = total; } RESIZE_CAPA_TERM(str, capa, termlen); sptr = RSTRING_PTR(str); -- cgit v1.2.3