shyouhei	2008-06-15 22:20:09 +0900 (Sun, 15 Jun 2008)

  New Revision: 17256

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

  Log:
    merge revision(s) 16144:
    * sprintf.c (rb_f_sprintf): should protect temporary string from
      GC.   [ruby-dev:34480]


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

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17255)
+++ ruby_1_8_5/ChangeLog	(revision 17256)
@@ -1,3 +1,8 @@
+Sun Jun 15 22:19:33 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* sprintf.c (rb_f_sprintf): should protect temporary string from
+	  GC.   [ruby-dev:34480]
+
 Sun Jun 15 22:17:35 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* regex.c (re_search): string might be NULL.  [ruby-core:16478]
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17255)
+++ ruby_1_8_5/version.h	(revision 17256)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #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_5/sprintf.c
===================================================================
--- ruby_1_8_5/sprintf.c	(revision 17255)
+++ ruby_1_8_5/sprintf.c	(revision 17256)
@@ -485,7 +485,7 @@
 		long v = 0;
 		int base, bignum = 0;
 		int len, pos;
-		VALUE tmp;
+		volatile VALUE tmp;
                 volatile VALUE tmp1;
 
 		switch (*p) {

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