diff options
| author | NARUSE, Yui <naruse@airemix.jp> | 2021-04-02 12:27:26 +0900 |
|---|---|---|
| committer | NARUSE, Yui <naruse@airemix.jp> | 2021-04-02 12:27:26 +0900 |
| commit | 1a47de64f44da6d4339ba8b2c5220eeaba82954c (patch) | |
| tree | 9a6edc691c4b97cedcc9ad2231b02d70098591d8 /eval_intern.h | |
| parent | d1cec0bca588266b9af1d55e592016c45ee68fbb (diff) | |
merge revision(s) f748b911c9157a0bb86f38280ddfba72a55049b6: [Backport #17729]
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(-)
Diffstat (limited to 'eval_intern.h')
| -rw-r--r-- | eval_intern.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/eval_intern.h b/eval_intern.h index 34489777a2..9fa9031189 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -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. */ # 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 # define CharNext(p) ((p) + 1) # endif |