Permalink
Browse files

* 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
  • Loading branch information...
1 parent ebd8663 commit 82b8467e23757a01805698bf0e982fa3b93d9310 ngoto committed Mar 21, 2013
Showing with 8 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +2 −2 marshal.c
View
@@ -1,3 +1,9 @@
+Thu Mar 21 22:39:46 2013 Naohisa Goto <ngotogenome@gmail.com>
+
+ * 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]
+
Thu Mar 21 16:48:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (simple_re_meta): escape all closing characters, not only
View
@@ -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);

0 comments on commit 82b8467

Please sign in to comment.