diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | regex.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Jun 15 22:18:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * regex.c (re_search): string might be NULL. [ruby-core:16478] + Sun Jun 15 22:16:21 2008 NAKAMURA Usaku <usa@ruby-lang.org> * time.c (rb_strftime): check errno to detect strftime(3)'s error. @@ -3177,6 +3177,10 @@ re_search(bufp, string, size, startpos, range, regs) /* Check for out-of-range starting position. */ if (startpos < 0 || startpos > size) return -1; + if (!string) { + if (size == 0) string = ""; + else return -1; + } /* Update the fastmap now if not correct already. */ if (fastmap && !bufp->fastmap_accurate) { @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 197 +#define RUBY_PATCHLEVEL 198 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |