shyouhei	2008-06-15 22:31:28 +0900 (Sun, 15 Jun 2008)

  New Revision: 17264

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/re.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16239:
    * re.c (rb_reg_search): use local variable.  a patch from wanabe
      <s.wanabe AT gmail.com> in [ruby-dev:34537].  [ruby-dev:34492]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/re.c?r1=17264&r2=17263&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17264&r2=17263&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17264&r2=17263&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17263)
+++ ruby_1_8_5/ChangeLog	(revision 17264)
@@ -1,3 +1,8 @@
+Sun Jun 15 22:30:30 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* re.c (rb_reg_search): use local variable.  a patch from wanabe
+	  <s.wanabe AT gmail.com> in [ruby-dev:34537].  [ruby-dev:34492]
+
 Sun Jun 15 22:21:07 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* dln.c (dln_find_1): prior files with extensions to files sans
Index: ruby_1_8_5/re.c
===================================================================
--- ruby_1_8_5/re.c	(revision 17263)
+++ ruby_1_8_5/re.c	(revision 17264)
@@ -78,7 +78,7 @@
     int tmp;
 
     while (len--) {
-	if (tmp = casetable[(unsigned)*p1++] - casetable[(unsigned)*p2++])
+	if ((tmp = casetable[(unsigned)*p1++] - casetable[(unsigned)*p2++]) != 0)
 	    return tmp;
     }
     return 0;
@@ -892,7 +892,7 @@
 {
     long result;
     VALUE match;
-    static struct re_registers regs;
+    struct re_registers regs;
     long range;
 
     if (pos > RSTRING(str)->len || pos < 0) {
@@ -914,6 +914,7 @@
     else {
 	range = RSTRING(str)->len - pos;
     }
+    MEMZERO(&regs, struct re_registers, 1);
     result = re_search(RREGEXP(re)->ptr,RSTRING(str)->ptr,RSTRING(str)->len,
 		       pos, range, &regs);
 
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17263)
+++ ruby_1_8_5/version.h	(revision 17264)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 199
+#define RUBY_PATCHLEVEL 200
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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