diff options
author | aycabta <aycabta@gmail.com> | 2020-03-26 16:43:16 +0900 |
---|---|---|
committer | aycabta <aycabta@gmail.com> | 2020-03-26 17:41:21 +0900 |
commit | 22477128cd77e0d0dce7e78bc12f9cc8cccc1cb4 (patch) | |
tree | b0c88a22f80a3f4609cf00bc3dcd0a251a7698b9 | |
parent | ffbb162f1a052054ce2864d2971e83da10f8aa78 (diff) | |
download | ruby-22477128cd77e0d0dce7e78bc12f9cc8cccc1cb4.tar.gz |
[ruby/irb] Suppress crashing when EncodingError has occurred without lineno
https://github.com/ruby/irb/commit/13572d8cdc
-rw-r--r-- | lib/irb.rb | 3 | ||||
-rw-r--r-- | lib/irb/ruby-lex.rb | 2 | ||||
-rw-r--r-- | test/irb/test_context.rb | 7 |
3 files changed, 11 insertions, 1 deletions
diff --git a/lib/irb.rb b/lib/irb.rb index e73174e1c8..ee6979c6d0 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -554,7 +554,8 @@ module IRB def handle_exception(exc) if exc.backtrace && exc.backtrace[0] =~ /\/irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ && - !(SyntaxError === exc) + !(SyntaxError === exc) && !(EncodingError === exc) + # The backtrace of invalid encoding hash (ex. {"\xAE": 1}) raises EncodingError without lineno. irb_bug = true else irb_bug = false diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 251db9efaa..d5630c8b52 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -211,6 +211,8 @@ class RubyLex else RubyVM::InstructionSequence.compile(code) end + rescue EncodingError + # This is for a hash with invalid encoding symbol, {"\xAE": 1} rescue SyntaxError => e case e.message when /unterminated (?:string|regexp) meets end of file/ diff --git a/test/irb/test_context.rb b/test/irb/test_context.rb index 8a6521bf69..d03cc30c78 100644 --- a/test/irb/test_context.rb +++ b/test/irb/test_context.rb @@ -63,6 +63,13 @@ module TestIRB assert_not_match(/rescue _\.class/, e.message) end + def test_evaluate_with_encoding_error_without_lineno + assert_raise_with_message(EncodingError, /invalid symbol/) { + @context.evaluate(%q[{"\xAE": 1}], 1) + # The backtrace of this invalid encoding hash doesn't contain lineno. + } + end + def test_evaluate_with_onigmo_warning assert_warning("(irb):1: warning: character class has duplicated range: /[aa]/\n") do @context.evaluate('/[aa]/', 1) |