2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 004ac1e82c..0a98943784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 23 12:28:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_search): fix: 4th argument should be regexp
+	  object. patched by shintaro kuwamoto [ruby-dev:41667] #3459
+
 Mon Aug 23 02:23:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* util.c (ruby_strtod): make sure to have digit-sequence after 'p'
diff --git a/re.c b/re.c
index 8484c68ee2..298d1d9554 100644
--- a/re.c
+++ b/re.c
@@ -1395,7 +1395,7 @@ rb_reg_search(VALUE re, VALUE str, long pos, int reverse)
 	else {
 	    onig_errmsg_buffer err = "";
 	    onig_error_code_to_str((UChar*)err, (int)result);
-	    rb_reg_raise(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), err, 0);
+	    rb_reg_raise(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), err, re);
 	}
     }