summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:20:49 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:20:49 +0000
commit91b44737f1161739c22db3345ed6dd2475722705 (patch)
tree3f1ada61f0c9fe367e407a8f99265151d34c64b3
parente4cac77252307c3311d2d799e064fb27f921b3d3 (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_6@17258 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 005a76f..1423f0d 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 e32c456..c5334b1 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 ca10a89..b213197 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