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

* string.c (rb_str_check_dummy_enc): new function to check dummy

Browse Source 
encoding.

* string.c (rb_str_upcase_bang): case conversion functions should
  not be applicable to strings in dummy encoding.  [ruby-dev:36985]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-10-29 16:44:24 +00:00
parent 86ade65104
commit f27e4c045f
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -12,6 +12,14 @@ Thu Oct 30 01:10:32 2008 Yusuke Endoh <mame@tsg.ne.jp>
* test/ruby/test_array (test_permutation): add a test that replaces * test/ruby/test_array (test_permutation): add a test that replaces
array during permutation. array during permutation.
Wed Oct 29 23:31:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_check_dummy_enc): new function to check dummy
encoding.
* string.c (rb_str_upcase_bang): case conversion functions should
not be applicable to strings in dummy encoding. [ruby-dev:36985]
Wed Oct 29 23:57:29 2008 Yusuke Endoh <mame@tsg.ne.jp> Wed Oct 29 23:57:29 2008 Yusuke Endoh <mame@tsg.ne.jp>
* array.c (rb_ary_sort_bang): replacing array during sort broke * array.c (rb_ary_sort_bang): replacing array during sort broke

17
string.c
View File

@ -4220,6 +4220,15 @@ rb_str_dump(VALUE str)
} }
static void
rb_str_check_dummy_enc(rb_encoding *enc)
{
if (rb_enc_dummy_p(enc)) {
rb_raise(rb_eEncCompatError, "incompatible encoding with this operation: %s",
rb_enc_name(enc));
}
}
/* /*
* call-seq: * call-seq:
* str.upcase! => str or nil * str.upcase! => str or nil
@ -4238,6 +4247,7 @@ rb_str_upcase_bang(VALUE str)
str_modify_keep_cr(str); str_modify_keep_cr(str);
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc);
s = RSTRING_PTR(str); send = RSTRING_END(str); s = RSTRING_PTR(str); send = RSTRING_END(str);
if (single_byte_optimizable(str)) { if (single_byte_optimizable(str)) {
while (s < send) { while (s < send) {
@ -4319,6 +4329,7 @@ rb_str_downcase_bang(VALUE str)
str_modify_keep_cr(str); str_modify_keep_cr(str);
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc);
s = RSTRING_PTR(str); send = RSTRING_END(str); s = RSTRING_PTR(str); send = RSTRING_END(str);
if (single_byte_optimizable(str)) { if (single_byte_optimizable(str)) {
while (s < send) { while (s < send) {
@ -4406,6 +4417,7 @@ rb_str_capitalize_bang(VALUE str)
str_modify_keep_cr(str); str_modify_keep_cr(str);
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc);
if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil; if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil;
s = RSTRING_PTR(str); send = RSTRING_END(str); s = RSTRING_PTR(str); send = RSTRING_END(str);
@ -4469,6 +4481,7 @@ rb_str_swapcase_bang(VALUE str)
str_modify_keep_cr(str); str_modify_keep_cr(str);
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc);
s = RSTRING_PTR(str); send = RSTRING_END(str); s = RSTRING_PTR(str); send = RSTRING_END(str);
while (s < send) { while (s < send) {
unsigned int c = rb_enc_codepoint(s, send, enc); unsigned int c = rb_enc_codepoint(s, send, enc);
@ -5996,9 +6009,7 @@ rb_str_rstrip_bang(VALUE str)
char *s, *t, *e; char *s, *t, *e;
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);
if (rb_enc_dummy_p(enc)) { rb_str_check_dummy_enc(enc);
rb_raise(rb_eEncCompatError, "incompatible encoding with this operation: %s", rb_enc_name(enc));
}
s = RSTRING_PTR(str); s = RSTRING_PTR(str);
if (!s || RSTRING_LEN(str) == 0) return Qnil; if (!s || RSTRING_LEN(str) == 0) return Qnil;
t = e = RSTRING_END(str); t = e = RSTRING_END(str);