author | April Chin <april.chin@oracle.com> |
Mon, 26 Aug 2013 09:38:49 -0700 | |
branch | s11u1-sru |
changeset 2744 | 815f335abb92 |
permissions | -rw-r--r-- |
2744
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
diff -rupN ruby-1.8.7-p374.orig/marshal.c ruby-1.8.7-p374/marshal.c |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
--- ruby-1.8.7-p374.orig/marshal.c 2012-03-01 18:45:35.000000000 -0800 |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
+++ ruby-1.8.7-p374/marshal.c 2013-08-10 16:45:24.260126000 -0700 |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
@@ -756,7 +756,7 @@ marshal_dump(argc, argv) |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
VALUE obj, port, a1, a2; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
int limit = -1; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
struct dump_arg *arg; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
- VALUE wrapper; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
+ volatile VALUE wrapper; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
|
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
port = Qnil; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
rb_scan_args(argc, argv, "12", &obj, &a1, &a2); |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
@@ -1450,7 +1450,8 @@ marshal_load(argc, argv) |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
{ |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
VALUE port, proc; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
int major, minor, taint = Qfalse; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
- VALUE v, wrapper; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
+ VALUE v; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
+ volatile VALUE wrapper; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
struct load_arg *arg; |
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
|
815f335abb92
17075828 upgrade ruby to 1.8.7-p374
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
rb_scan_args(argc, argv, "11", &port, &proc); |