From baedd2b4f7ea3d9e5a37d2c19184b75dfdcc68e9 Mon Sep 17 00:00:00 2001
From: kosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 21 May 2006 00:56:05 +0000
Subject: [PATCH] fix bug [ruby-list:42234]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 regexec.c | 3 ++-
 version.h | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34c7f15f02..b22cde12f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sunn May 21 09:50:31 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* regexec.c: add STK_NULL_CHECK_END to IS_TO_VOID_TARGET().
+	  [ruby-list:42234]
+
 Thu May 18 22:37:20 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/config.rb (WEBrick::Config::HTTP): add new parameters,
diff --git a/regexec.c b/regexec.c
index de14d6d818..90514d403c 100644
--- a/regexec.c
+++ b/regexec.c
@@ -360,7 +360,8 @@ typedef struct _StackType {
 /* stack type check mask */
 #define STK_MASK_POP_USED     0x00ff
 #define IS_TO_VOID_TARGET(stk) \
-     (((stk)->type & STK_MASK_POP_USED) || (stk)->type == STK_NULL_CHECK_START)
+     (((stk)->type & STK_MASK_POP_USED) || \
+       (stk)->type == STK_NULL_CHECK_START || (stk)->type == STK_NULL_CHECK_END)
 
 typedef struct {
   void* stack_p;
diff --git a/version.h b/version.h
index d66a763096..2dd0dea7bb 100644
--- a/version.h
+++ b/version.h
@@ -1,14 +1,14 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2006-05-18"
+#define RUBY_RELEASE_DATE "2006-05-21"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20060518
+#define RUBY_RELEASE_CODE 20060521
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2006
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 21
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];