diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 22:34:12 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 22:34:12 +0000 |
commit | e0f8351d5528cd01ab71855eae87ef067de55626 (patch) | |
tree | 3b259c3c1fb9703175ad43836cc4ef3210035797 /ChangeLog | |
parent | 2bd2ea829f360bdae74281230aa3377b0c81fa14 (diff) |
merge revision(s) 34236: [Backport #5890]
* numeric.c (rb_enc_uint_char): raise RangeError when added codepoint
is invalid. [Feature #5855] [Bug #5863] [Bug #5864]
* string.c (rb_str_concat): ditto.
* string.c (rb_str_concat): set encoding as ASCII-8BIT when the string
is US-ASCII and the argument is an integer greater than 127.
* regenc.c (onigenc_mb2_code_to_mbclen): rearrange error code.
* enc/euc_jp.c (code_to_mbclen): ditto.
* enc/shift_jis.c (code_to_mbclen): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -1,3 +1,19 @@ +Thu Feb 9 07:32:40 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * numeric.c (rb_enc_uint_char): raise RangeError when added codepoint + is invalid. [Feature #5855] [Bug #5863] [Bug #5864] + + * string.c (rb_str_concat): ditto. + + * string.c (rb_str_concat): set encoding as ASCII-8BIT when the string + is US-ASCII and the argument is an integer greater than 127. + + * regenc.c (onigenc_mb2_code_to_mbclen): rearrange error code. + + * enc/euc_jp.c (code_to_mbclen): ditto. + + * enc/shift_jis.c (code_to_mbclen): ditto. + Thu Feb 9 07:28:43 2012 NARUSE, Yui <naruse@ruby-lang.org> * test/pathname/test_pathname.rb: not read but binread. |