shyouhei	2008-06-15 23:12:53 +0900 (Sun, 15 Jun 2008)

  New Revision: 17313

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/parse.y
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16534:
    * parse.y (top_local_setup): fixed memory leak bug based on a
      patch from Roger Pack <rogerpack2005 at gmail.com> in
      [ruby-core:16610].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17313&r2=17312&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/parse.y?r1=17313&r2=17312&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17313&r2=17312&diff_format=u

Index: ruby_1_8_5/parse.y
===================================================================
--- ruby_1_8_5/parse.y	(revision 17312)
+++ ruby_1_8_5/parse.y	(revision 17313)
@@ -5742,7 +5742,7 @@
 		    rb_mem_clear(vars+i, len-i);
 		}
 		else {
-		    *vars++ = (VALUE)ruby_scope;
+		    *vars++ = 0;
 		    rb_mem_clear(vars, len);
 		}
 		ruby_scope->local_vars = vars;
@@ -5758,6 +5758,7 @@
                if (!(ruby_scope->flags & SCOPE_CLONE))
                    xfree(ruby_scope->local_tbl);
 	    }
+            ruby_scope->local_vars[-1] = 0; /* no reference needed */
 	    ruby_scope->local_tbl = local_tbl();
 	}
     }
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17312)
+++ ruby_1_8_5/ChangeLog	(revision 17313)
@@ -1,3 +1,9 @@
+Sun Jun 15 23:12:02 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* parse.y (top_local_setup): fixed memory leak bug based on a
+	  patch from Roger Pack <rogerpack2005 at gmail.com> in
+	  [ruby-core:16610].
+
 Sun Jun 15 23:08:29 2008  NAKAMURA Usaku  <usa@r...>
 
 	* sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17312)
+++ ruby_1_8_5/version.h	(revision 17313)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 211
+#define RUBY_PATCHLEVEL 212
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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