aboutsummaryrefslogtreecommitdiffstats
path: root/marshal.c
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-21 13:50:20 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-21 13:50:20 +0000
commit82b8467e23757a01805698bf0e982fa3b93d9310 (patch)
tree0eb31a28f3c61588c001343ca44b156921fb979c /marshal.c
parentebd866348254f245f6d689ece6781499489aa411 (diff)
downloadruby-82b8467e23757a01805698bf0e982fa3b93d9310.tar.gz
* marshal.c (marshal_dump, marshal_load): workaround for segv on
Intel Solaris compiled with Oracle SolarisStudio 12.3. Partly revert r38174. [ruby-core:52042] [Bug #7805] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/marshal.c b/marshal.c
index 9ec1f9400f..304e9d0a6b 100644
--- a/marshal.c
+++ b/marshal.c
@@ -925,7 +925,7 @@ marshal_dump(int argc, VALUE *argv)
VALUE obj, port, a1, a2;
int limit = -1;
struct dump_arg *arg;
- VALUE wrapper;
+ volatile VALUE wrapper;
port = Qnil;
rb_scan_args(argc, argv, "12", &obj, &a1, &a2);
@@ -1929,7 +1929,7 @@ marshal_load(int argc, VALUE *argv)
VALUE port, proc;
int major, minor, infection = 0;
VALUE v;
- VALUE wrapper;
+ volatile VALUE wrapper;
struct load_arg *arg;
rb_scan_args(argc, argv, "11", &port, &proc);