diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | string.c | 15 |
2 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Jul 29 16:00:22 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (str_buf_cat): consider empty non-embed string case, + not to loop infinitely. [ruby-core:70074] [Bug #11383] + Wed Jul 29 15:25:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_eval.c (send_internal): set method_missing_reason before @@ -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); |