merge revision(s) 16144:

shyouhei · shyouhei · commit f8535d1b8a3a · 2008-06-15T13:20:09.000Z
* sprintf.c (rb_f_sprintf): should protect temporary string from
	  GC.   [ruby-dev:34480]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 22:19:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): should protect temporary string from
+	  GC.   [ruby-dev:34480]
+
 Sun Jun 15 22:17:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* regex.c (re_search): string might be NULL.  [ruby-core:16478]
diff --git a/sprintf.c b/sprintf.c
@@ -485,7 +485,7 @@ rb_f_sprintf(argc, argv)
 		long v = 0;
 		int base, bignum = 0;
 		int len, pos;
-		VALUE tmp;
+		volatile VALUE tmp;
                 volatile VALUE tmp1;
 
 		switch (*p) {
diff --git a/version.h b/version.h
@@ -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
