kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* string.c (tr_trans): get rid of segfaults when has mulitbytes but

Browse source 
source sets have no mulitbytes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-09 02:29:24 +00:00
parent 221e6de720
commit 54c146d2c3
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Dec 9 11:29:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (tr_trans): get rid of segfaults when has mulitbytes but
source sets have no mulitbytes.
Sun Dec 9 04:01:28 2007 Tanaka Akira <akr@fsij.org>
* encoding.c (rb_enc_mbclen): return 1 if underlying implementation

8
bootstraptest/test_knownbug.rb
View file

@ -162,11 +162,3 @@ assert_equal 'true', %q{
s = "\xa3\xb0\xa3\xb1\xa3\xb1\xa3\xb3\xa3\xb4".force_encoding("euc-jp")
s.squeeze == "\xa3\xb0\xa3\xb1\xa3\xb3\xa3\xb4".force_encoding("euc-jp")
}
assert_normal_exit %q{
"\x81\x41".force_encoding("shift_jis").tr("A", "B")
}
assert_normal_exit %q{
"\x81\x41".force_encoding("shift_jis").tr_s("A", "B")
}

4
string.c
View file

@ -3466,7 +3466,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
v = trans[c] >= 0 ? trans[c] : Qnil;
}
else {
v = rb_hash_aref(hash, INT2NUM(c));
v = hash ? rb_hash_aref(hash, INT2NUM(c)) : Qnil;
}
if (!NIL_P(v)) {
if (!cflag) {
@ -3531,7 +3531,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
v = trans[c] >= 0 ? trans[c] : Qnil;
}
else {
v = rb_hash_aref(hash, INT2NUM(c));
v = hash ? rb_hash_aref(hash, INT2NUM(c)) : Qnil;
}
if (!NIL_P(v)) {
if (!cflag) {

6
test/ruby/test_m17n.rb
View file

@ -483,4 +483,10 @@ class TestM17N < Test::Unit::TestCase
assert_raise(SyntaxError) { eval(s(%{/\\u{6666}#{}\\xc2\\xa0/})) }
assert_nothing_raised { eval(u(%{/\\u{6666}#{}\\xc2\\xa0/})) }
end
def test_tr
s = "\x81\x41".force_encoding("shift_jis")
assert_equal(s.tr("A", "B"), s)
assert_equal(s.tr_s("A", "B"), s)
end
end