Skip to content

Commit 2aa6072

Browse files
nobutmm1
authored andcommitted
string.c: shrink too big buffer
* string.c (rb_str_resize): shrink the buffer even if new length is same but it is enough smaller than the capacity. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Conflicts: string.c
1 parent 9574ced commit 2aa6072

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

string.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2034,9 +2034,11 @@ rb_str_resize(VALUE str, long len)
20342034
independent = str_independent(str);
20352035
ENC_CODERANGE_CLEAR(str);
20362036
slen = RSTRING_LEN(str);
2037-
if (len != slen) {
2037+
2038+
{
20382039
const int termlen = TERM_LEN(str);
20392040
if (STR_EMBED_P(str)) {
2041+
if (len == slen) return str;
20402042
if (len + termlen <= RSTRING_EMBED_LEN_MAX + 1) {
20412043
STR_SET_EMBED_LEN(str, len);
20422044
TERM_FILL(RSTRING(str)->as.ary + len, termlen);
@@ -2056,11 +2058,13 @@ rb_str_resize(VALUE str, long len)
20562058
return str;
20572059
}
20582060
else if (!independent) {
2061+
if (len == slen) return str;
20592062
str_make_independent_expand(str, len - slen);
20602063
}
20612064
else if (slen < len || slen - len > 1024) {
20622065
REALLOC_N(RSTRING(str)->as.heap.ptr, char, len + termlen);
20632066
}
2067+
else if (len == slen) return str;
20642068
if (!STR_NOCAPA_P(str)) {
20652069
RSTRING(str)->as.heap.aux.capa = len;
20662070
}

0 commit comments

Comments
 (0)