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) f748b911c9: [Backport #17729]

Browse source 
Fix infinite loop at illegal sequence [Bug #17729]

	As mblen returns -1 on failure, skip the first byte and try the
	succeeding bytes in that case.

	Close https://github.com/ruby/ruby/pull/4281
	---
	 eval_intern.h                 | 11 ++++++++++-
	 test/ruby/test_rubyoptions.rb |  5 +++++
	 2 files changed, 15 insertions(+), 1 deletion(-)
This commit is contained in:
NARUSE, Yui 2021-04-02 12:27:26 +09:00
parent d1cec0bca5
commit 1a47de64f4
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
eval_intern.h
View file

@ -302,7 +302,16 @@ VALUE rb_ec_backtrace_location_ary(const rb_execution_context_t *ec, long lev, l
#ifndef CharNext /* defined as CharNext[AW] on Windows. */ #ifndef CharNext /* defined as CharNext[AW] on Windows. */
# ifdef HAVE_MBLEN # ifdef HAVE_MBLEN
# define CharNext(p) ((p) + mblen((p), RUBY_MBCHAR_MAXSIZE)) # define CharNext(p) rb_char_next(p)
static inline const char *
rb_char_next(const char *p)
{
if (p) {
int len = mblen(p, RUBY_MBCHAR_MAXSIZE);
p += len > 0 ? len : 1;
}
return p;
}
# else # else
# define CharNext(p) ((p) + 1) # define CharNext(p) ((p) + 1)
# endif # endif

5
test/ruby/test_rubyoptions.rb
View file

@ -1075,6 +1075,11 @@ class TestRubyOptions < Test::Unit::TestCase
end end
end end
def test_rubylib_invalid_encoding
env = {"RUBYLIB"=>"\xFF", "LOCALE"=>"en_US.UTF-8", "LC_ALL"=>"en_US.UTF-8"}
assert_ruby_status([env, "-e;"])
end
def test_null_script def test_null_script
skip "#{IO::NULL} is not a character device" unless File.chardev?(IO::NULL) skip "#{IO::NULL} is not a character device" unless File.chardev?(IO::NULL)
assert_in_out_err([IO::NULL], success: true) assert_in_out_err([IO::NULL], success: true)

2
version.h
View file

@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 58 #define RUBY_PATCHLEVEL 59
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4