From 7a7f267b88904743278dc265fbecd46964ff1570 Mon Sep 17 00:00:00 2001 From: Tomoyuki Sahara Date: Wed, 12 Sep 2012 20:01:55 +0900 Subject: check if an Exception instance has a "mesg" attribute fix the issue that "Exception.new.inspect" causes SIGSEGV. --- src/error.c | 9 ++++++--- test/t/exception.rb | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/error.c b/src/error.c index 1adf5cb05..1f352c853 100644 --- a/src/error.c +++ b/src/error.c @@ -134,20 +134,23 @@ exc_inspect(mrb_state *mrb, mrb_value exc) mrb_str_cat2(mrb, str, ":"); mrb_str_append(mrb, str, line); mrb_str_cat2(mrb, str, ": "); - if (RSTRING_LEN(mesg) > 0) { + if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) { mrb_str_append(mrb, str, mesg); mrb_str_cat2(mrb, str, " ("); } mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc)); - if (RSTRING_LEN(mesg) > 0) { + if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) { mrb_str_cat2(mrb, str, ")"); } } else { str = mrb_str_new2(mrb, mrb_obj_classname(mrb, exc)); - if (RSTRING_LEN(mesg) > 0) { + if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) { mrb_str_cat2(mrb, str, ": "); mrb_str_append(mrb, str, mesg); + } else { + mrb_str_cat2(mrb, str, ": "); + mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc)); } } return str; diff --git a/test/t/exception.rb b/test/t/exception.rb index 2ea319caa..76c165e95 100644 --- a/test/t/exception.rb +++ b/test/t/exception.rb @@ -269,3 +269,6 @@ assert('Exception 14') do a == :ok end +assert('Exception#inspect without message') do + Exception.new.inspect +end -- cgit v1.2.3