shyouhei	2008-06-15 22:18:59 +0900 (Sun, 15 Jun 2008)

  New Revision: 17254

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/regex.c
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 16143:
    * regex.c (re_search): string might be NULL.  [ruby-core:16478]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17254&r2=17253&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17254&r2=17253&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/regex.c?r1=17254&r2=17253&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17253)
+++ ruby_1_8_6/ChangeLog	(revision 17254)
@@ -1,3 +1,7 @@
+Sun Jun 15 22:18:30 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* regex.c (re_search): string might be NULL.  [ruby-core:16478]
+
 Sun Jun 15 22:16:21 2008  NAKAMURA Usaku  <usa@r...>
 
 	* time.c (rb_strftime): check errno to detect strftime(3)'s error.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17253)
+++ ruby_1_8_6/version.h	(revision 17254)
@@ -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
Index: ruby_1_8_6/regex.c
===================================================================
--- ruby_1_8_6/regex.c	(revision 17253)
+++ ruby_1_8_6/regex.c	(revision 17254)
@@ -3177,6 +3177,10 @@
   /* 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) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/