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

merge revision(s) 57816,57817: [Backport #13292]

Browse source 
fix UTF-32 valid_encoding?

	* enc/utf_32be.c (utf32be_mbc_enc_len): check arguments precisely.
	  [ruby-core:79966] [Bug #13292]

	* enc/utf_32le.c (utf32le_mbc_enc_len): ditto.

	* regenc.h (UNICODE_VALID_CODEPOINT_P): predicate for valid
	  Unicode codepoints.
	fix UTF-32 valid_encoding?

	* test/ruby/test_io_m17n.rb (TestIO_M17N#test_puts_widechar): do
	  not use invalid codepoint.  [ruby-core:79966] [Bug #13292]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-03-27 17:34:10 +00:00
parent ff6e8710ee
commit 909331e26e
6 changed files with 104 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
enc/utf_32be.c
View file

@ -29,11 +29,23 @@
#include "regenc.h"
static OnigCodePoint utf32be_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc);
static int
utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
OnigEncoding enc ARG_UNUSED)
utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e,
OnigEncoding enc)
{
return 4;
if (e < p) {
return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
}
else if (e-p < 4) {
return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-(int)(e-p));
}
else {
OnigCodePoint c = utf32be_mbc_to_code(p, e, enc);
if (!UNICODE_VALID_CODEPOINT_P(c))
return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
}
}
static int