From 9c615e03007d348438f458dfd0dbbb9626ff3145 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 15 Feb 2008 00:44:13 +0000
Subject: * parse.y (reg_compile_gen): reg_fragment_setenc might not raise an  
 exception before rb_reg_compile.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 90098a6f9..0c8eb7ab9 100644
--- a/parse.y
+++ b/parse.y
@@ -8655,10 +8655,14 @@ reg_compile_gen(struct parser_params* parser, VALUE str, int options)
     re = rb_reg_compile(str, options & RE_OPTION_MASK);
     if (NIL_P(re)) {
 	ID mesg = rb_intern("mesg");
-	VALUE m = rb_attr_get(err, mesg);
-	rb_str_cat(m, "\n", 1);
-	rb_str_append(m, rb_attr_get(rb_errinfo(), mesg));
+	VALUE m = rb_attr_get(rb_errinfo(), mesg);
 	rb_set_errinfo(err);
+	if (!NIL_P(err)) {
+	    rb_str_append(rb_str_cat(rb_attr_get(err, mesg), "\n", 1), m);
+	}
+	else {
+	    compile_error(PARSER_ARG "%s", RSTRING_PTR(m));
+	}
 	return Qnil;
     }
     return re;
-- 
cgit