From e0f8351d5528cd01ab71855eae87ef067de55626 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 8 Feb 2012 22:34:12 +0000 Subject: 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 --- ChangeLog | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index ab140541b0..37d4fc788c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Thu Feb 9 07:32:40 2012 NARUSE, Yui + + * 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 * test/pathname/test_pathname.rb: not read but binread. -- cgit v1.2.3