summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:20:09 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:20:09 (GMT)
commitf8535d1b8a3a3d08ba2f85f272abe6d5eec8f439 (patch)
tree8c7e742d7bb9c53ef7225682f5b1ff6ce727fba5
parent5150a36a97d192a5a184ec4b2c68b510d6971c59 (diff)
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_5@17256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--sprintf.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7db1315..cb277e1 100644
--- 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
index be6d274..9ac3aa9 100644
--- 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
index 054894c..586c9a5 100644
--- 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