summaryrefslogtreecommitdiffstats
path: root/string.c
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-28 14:40:53 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-28 14:40:53 +0000
commitedbfa15a4fa6d609a5fc07eb0cbf9371a80383d0 (patch)
treea09e5cbf3945eb2ba5f3190492e5ca6f42a5f0b5 /string.c
parent2d4c268423c5846054a6ddad0741752097f45466 (diff)
downloadruby-edbfa15a4fa6d609a5fc07eb0cbf9371a80383d0.tar.gz
ruby-edbfa15a4fa6d609a5fc07eb0cbf9371a80383d0.tar.xz
ruby-edbfa15a4fa6d609a5fc07eb0cbf9371a80383d0.zip
* string.c (rb_str_shared_replace): remove corrupt noembed string
which causes SEGV. [ruby-dev:35989] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/string.c b/string.c
index 0451a7ccd..26b57b5e3 100644
--- a/string.c
+++ b/string.c
@@ -669,10 +669,9 @@ rb_str_shared_replace(VALUE str, VALUE str2)
else {
RSTRING(str)->as.heap.aux.capa = RSTRING(str2)->as.heap.aux.capa;
}
- RSTRING(str2)->as.heap.ptr = 0; /* abandon str2 */
- RSTRING(str2)->as.heap.len = 0;
- RSTRING(str2)->as.heap.aux.capa = 0;
- STR_UNSET_NOCAPA(str2);
+ STR_SET_EMBED(str2); /* abandon str2 */
+ RSTRING_PTR(str2)[0] = 0;
+ STR_SET_EMBED_LEN(str2, 0);
rb_enc_associate(str, enc);
ENC_CODERANGE_SET(str, cr);
}