merge revision(s) 16144:

	* 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_6@17258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 005a76f4e7..1423f0d7a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 22:20:45 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:18:30 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
index e32c456b63..c5334b1f9f 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -471,7 +471,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
index ca10a89e59..b2131975ac 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 198
+#define RUBY_PATCHLEVEL 199
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8