archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 57078: [Backport #13034]

Browse source 
encoding.c: handle needmore error from rb_enc_precise_mbclen()

	rb_enc_ascget() erroneously reports success even if the given byte
	sequence is incomplete, for non-ASCII compatible encoding strings.

	rb_enc_precise_mbclen() may return a negative value on error, and thus
	rb_enc_ascget() must not store the return value in 'unsigned int';
	otherwise the subsequent MBCLEN_CHARFOUND_P() check won't catch the
	error.  [ruby-core:78646] [Bug #13034]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@57348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-01-16 19:31:25 +00:00
parent 8cc9818463
commit f327b5e23c
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
encoding.c
View file

@ -1031,7 +1031,8 @@ rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc)
int
rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc)
{
unsigned int c, l;
unsigned int c;
int l;
if (e <= p)
return -1;
if (rb_enc_asciicompat(enc)) {

4
test/ruby/test_regexp.rb
View file

@ -493,6 +493,10 @@ class TestRegexp < Test::Unit::TestCase
assert_equal("\\v", Regexp.quote("\v"))
assert_equal("\u3042\\t", Regexp.quote("\u3042\t"))
assert_equal("\\t\xff", Regexp.quote("\t" + [0xff].pack("C")))
bug13034 = '[ruby-core:78646] [Bug #13034]'
str = "\x00".force_encoding("UTF-16BE")
assert_equal(str, Regexp.quote(str), bug13034)
end
def test_try_convert

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-01-17"
#define RUBY_PATCHLEVEL 232
#define RUBY_PATCHLEVEL 233
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 1