summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-04 03:55:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-04 03:55:32 +0000
commitbebc52a4a721a1c1d5a98760d58df296ff0d2497 (patch)
tree4abcc62ad82bfe40e38620eb6a3dee6e0c870b7c /string.c
parent5b92c0bea3dc23b0c2be356bedafdd4e7f9110d7 (diff)
string.c: enable capacity when setting capa
* string.c (rb_str_modify_expand): enable capacity and disable assocation with packed objects when setting capa, so that pack("p") string fails to unpack properly after modified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/string.c b/string.c
index ee57f92716..983c2a1166 100644
--- a/string.c
+++ b/string.c
@@ -1503,6 +1503,7 @@ rb_str_modify_expand(VALUE str, long expand)
int termlen = TERM_LEN(str);
if (!STR_EMBED_P(str)) {
REALLOC_N(RSTRING(str)->as.heap.ptr, char, capa + termlen);
+ STR_UNSET_NOCAPA(str);
RSTRING(str)->as.heap.aux.capa = capa;
}
else if (capa + termlen > RSTRING_EMBED_LEN_MAX + 1) {