summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 09:42:22 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 09:42:22 +0000
commit38c94fa149554b354b4a25c003cae046ede7a596 (patch)
treea0814773bcda8549c15b90f9218b9923f9a0059f
parent0f9594eeb9518738a62c45c494d651e20b92e803 (diff)
* marshal.c (marshal_load): set arg.untrust properly.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--marshal.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 223602f74a..51eec91efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 13 18:34:22 2008 Shugo Maeda <shugo@ruby-lang.org>
+
+ * marshal.c (marshal_load): set arg.untrust properly.
+
Wed Aug 13 17:47:09 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (econv_inspect): new method.
diff --git a/marshal.c b/marshal.c
index 676f4f8eef..1ed67ad3be 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1623,6 +1623,7 @@ marshal_load(int argc, VALUE *argv)
else {
rb_raise(rb_eTypeError, "instance of IO needed");
}
+ arg.untrust = OBJ_UNTRUSTED(port);
arg.src = port;
arg.offset = 0;
arg.compat_tbl = st_init_numtable();