2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b1c3c1f78..2875bb9ce3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 23 12:21:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (make_regexp): should not return junk address during
+	  compile time.  [ruby-dev:26206]
+
 Sun May 22 21:54:06 2005  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
diff --git a/re.c b/re.c
index 46aa8e5b96..cec9d0fffd 100644
--- a/re.c
+++ b/re.c
@@ -643,6 +643,7 @@ make_regexp(s, len, flags)
     if (err != NULL) {
 	re_free_pattern(rp);
 	rb_reg_raise(s, len, err, 0);
+	return 0;
     }
     return rp;
 }