1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (string.c): call rb_str_buf_append to update encoding of

Browse Source 
str1, even if str2 is empty.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-01-11 14:26:26 +00:00
parent 857b3018dd
commit e350fe247a
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jan 11 23:22:31 2008 Tanaka Akira <akr@fsij.org>
* string.c (string.c): call rb_str_buf_append to update encoding of
str1, even if str2 is empty.
Fri Jan 11 20:20:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jan 11 20:20:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (proc_mark): needs to mark the receiver too. a patch from * proc.c (proc_mark): needs to mark the receiver too. a patch from

10
string.c
View File

@ -1194,8 +1194,7 @@ rb_str_append(VALUE str, VALUE str2)
int cr, cr2; int cr, cr2;
StringValue(str2); StringValue(str2);
if (RSTRING_LEN(str2) > 0) { if (RSTRING_LEN(str2) > 0 && STR_ASSOC_P(str)) {
if (STR_ASSOC_P(str)) {
long len = RSTRING_LEN(str)+RSTRING_LEN(str2); long len = RSTRING_LEN(str)+RSTRING_LEN(str2);
enc = rb_enc_check(str, str2); enc = rb_enc_check(str, str2);
cr = ENC_CODERANGE(str); cr = ENC_CODERANGE(str);
@ -1207,13 +1206,10 @@ rb_str_append(VALUE str, VALUE str2)
RSTRING(str)->as.heap.len = len; RSTRING(str)->as.heap.len = len;
rb_enc_associate(str, enc); rb_enc_associate(str, enc);
ENC_CODERANGE_SET(str, cr); ENC_CODERANGE_SET(str, cr);
}
else {
return rb_str_buf_append(str, str2);
}
}
OBJ_INFECT(str, str2); OBJ_INFECT(str, str2);
return str; return str;
}
return rb_str_buf_append(str, str2);
} }