summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-29 07:00:25 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-29 07:00:25 (GMT)
commit6f65a0ebf28ae362f99e0b38473b9105a4c5093d (patch)
tree1d3bbcb867d162347506f344176107c6673194b8 /string.c
parent149dadf368981bdd026dd0e86278cc86d74d48a6 (diff)
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
Diffstat (limited to 'string.c')
-rw-r--r--string.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/string.c b/string.c
index 0a8f4e1..026ebd7 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);