2003-09-04 12:18:59 -04:00
|
|
|
require 'test/unit'
|
2008-02-18 01:59:47 -05:00
|
|
|
require_relative 'marshaltestlib'
|
2003-09-04 12:18:59 -04:00
|
|
|
|
2004-02-17 09:15:37 -05:00
|
|
|
class TestMarshal < Test::Unit::TestCase
|
|
|
|
include MarshalTestLib
|
|
|
|
|
2008-07-23 08:38:49 -04:00
|
|
|
def setup
|
|
|
|
@verbose = $VERBOSE
|
|
|
|
$VERBOSE = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
def teardown
|
|
|
|
$VERBOSE = @verbose
|
|
|
|
end
|
|
|
|
|
2003-09-26 04:41:28 -04:00
|
|
|
def encode(o)
|
|
|
|
Marshal.dump(o)
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode(s)
|
|
|
|
Marshal.load(s)
|
|
|
|
end
|
|
|
|
|
2003-09-04 12:18:59 -04:00
|
|
|
def fact(n)
|
|
|
|
return 1 if n == 0
|
|
|
|
f = 1
|
|
|
|
while n>0
|
|
|
|
f *= n
|
|
|
|
n -= 1
|
|
|
|
end
|
|
|
|
return f
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_marshal
|
2006-12-31 10:02:22 -05:00
|
|
|
x = [1, 2, 3, [4,5,"foo"], {1=>"bar"}, 2.5, fact(30)]
|
|
|
|
assert_equal x, Marshal.load(Marshal.dump(x))
|
2003-09-04 12:18:59 -04:00
|
|
|
|
|
|
|
[[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z|
|
2006-12-31 10:02:22 -05:00
|
|
|
obj = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f))
|
|
|
|
assert_equal obj, Marshal.load(Marshal.dump(obj))
|
2003-09-04 12:18:59 -04:00
|
|
|
}
|
|
|
|
end
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
StrClone = String.clone
|
|
|
|
def test_marshal_cloned_class
|
|
|
|
assert_instance_of(StrClone, Marshal.load(Marshal.dump(StrClone.new("abc"))))
|
|
|
|
end
|
2007-09-02 02:39:58 -04:00
|
|
|
|
|
|
|
def test_inconsistent_struct
|
2007-09-07 19:06:33 -04:00
|
|
|
TestMarshal.const_set :StructOrNot, Struct.new(:a)
|
|
|
|
s = Marshal.dump(StructOrNot.new(1))
|
|
|
|
TestMarshal.instance_eval { remove_const :StructOrNot }
|
|
|
|
TestMarshal.const_set :StructOrNot, Class.new
|
2007-09-02 02:39:58 -04:00
|
|
|
assert_raise(TypeError, "[ruby-dev:31709]") { Marshal.load(s) }
|
|
|
|
end
|
2007-09-07 19:06:33 -04:00
|
|
|
|
|
|
|
def test_struct_invalid_members
|
|
|
|
TestMarshal.const_set :StructInvalidMembers, Struct.new(:a)
|
|
|
|
Marshal.load("\004\bIc&TestMarshal::StructInvalidMembers\006:\020__members__\"\bfoo")
|
|
|
|
assert_raise(TypeError, "[ruby-dev:31759]") {
|
|
|
|
TestMarshal::StructInvalidMembers.members
|
|
|
|
}
|
|
|
|
end
|
2007-10-14 20:58:09 -04:00
|
|
|
|
|
|
|
class C
|
|
|
|
def initialize(str)
|
|
|
|
@str = str
|
|
|
|
end
|
2008-01-26 05:31:11 -05:00
|
|
|
attr_reader :str
|
2007-10-14 20:58:09 -04:00
|
|
|
def _dump(limit)
|
|
|
|
@str
|
|
|
|
end
|
|
|
|
def self._load(s)
|
|
|
|
new(s)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_too_long_string
|
2008-01-26 00:05:07 -05:00
|
|
|
data = Marshal.dump(C.new("a".force_encoding("ascii-8bit")))
|
|
|
|
data[-2, 1] = "\003\377\377\377"
|
2007-10-14 20:58:09 -04:00
|
|
|
e = assert_raise(ArgumentError, "[ruby-dev:32054]") {
|
|
|
|
Marshal.load(data)
|
|
|
|
}
|
|
|
|
assert_equal("marshal data too short", e.message)
|
|
|
|
end
|
2008-01-26 05:31:11 -05:00
|
|
|
|
|
|
|
|
|
|
|
def test_userdef_encoding
|
|
|
|
s1 = "\xa4\xa4".force_encoding("euc-jp")
|
|
|
|
o1 = C.new(s1)
|
|
|
|
m = Marshal.dump(o1)
|
|
|
|
o2 = Marshal.load(m)
|
|
|
|
s2 = o2.str
|
|
|
|
assert_equal(s1, s2)
|
|
|
|
end
|
2008-06-03 09:34:48 -04:00
|
|
|
|
|
|
|
def test_pipe
|
|
|
|
o1 = C.new("a" * 10000)
|
|
|
|
|
|
|
|
r, w = IO.pipe
|
2008-06-07 23:01:55 -04:00
|
|
|
t = Thread.new { Marshal.load(r) }
|
2008-06-03 09:34:48 -04:00
|
|
|
Marshal.dump(o1, w)
|
2008-06-07 23:01:55 -04:00
|
|
|
o2 = t.value
|
2008-06-03 09:34:48 -04:00
|
|
|
assert_equal(o1.str, o2.str)
|
|
|
|
|
|
|
|
r, w = IO.pipe
|
2008-06-07 23:01:55 -04:00
|
|
|
t = Thread.new { Marshal.load(r) }
|
2008-06-03 09:34:48 -04:00
|
|
|
Marshal.dump(o1, w, 2)
|
2008-06-07 23:01:55 -04:00
|
|
|
o2 = t.value
|
2008-06-03 09:34:48 -04:00
|
|
|
assert_equal(o1.str, o2.str)
|
|
|
|
|
|
|
|
assert_raise(TypeError) { Marshal.dump("foo", Object.new) }
|
|
|
|
assert_raise(TypeError) { Marshal.load(Object.new) }
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_limit
|
|
|
|
assert_equal([[[]]], Marshal.load(Marshal.dump([[[]]], 3)))
|
|
|
|
assert_raise(ArgumentError) { Marshal.dump([[[]]], 2) }
|
2009-06-30 22:32:24 -04:00
|
|
|
assert_nothing_raised(ArgumentError, '[ruby-core:24100]') { Marshal.dump("\u3042", 1) }
|
2008-06-03 09:34:48 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_userdef_invalid
|
|
|
|
o = C.new(nil)
|
|
|
|
assert_raise(TypeError) { Marshal.dump(o) }
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_class
|
|
|
|
o = class << Object.new; self; end
|
|
|
|
assert_raise(TypeError) { Marshal.dump(o) }
|
|
|
|
assert_equal(Object, Marshal.load(Marshal.dump(Object)))
|
|
|
|
assert_equal(Enumerable, Marshal.load(Marshal.dump(Enumerable)))
|
|
|
|
end
|
|
|
|
|
|
|
|
class C2
|
|
|
|
def initialize(ary)
|
|
|
|
@ary = ary
|
|
|
|
end
|
|
|
|
def _dump(s)
|
|
|
|
@ary.clear
|
|
|
|
"foo"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_modify_array_during_dump
|
|
|
|
a = []
|
|
|
|
o = C2.new(a)
|
|
|
|
a << o << nil
|
|
|
|
assert_raise(RuntimeError) { Marshal.dump(a) }
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_change_class_name
|
|
|
|
eval("class C3; def _dump(s); 'foo'; end; end")
|
|
|
|
m = Marshal.dump(C3.new)
|
|
|
|
assert_raise(TypeError) { Marshal.load(m) }
|
|
|
|
eval("C3 = nil")
|
|
|
|
assert_raise(TypeError) { Marshal.load(m) }
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_change_struct
|
|
|
|
eval("C3 = Struct.new(:foo, :bar)")
|
|
|
|
m = Marshal.dump(C3.new("FOO", "BAR"))
|
|
|
|
eval("C3 = Struct.new(:foo)")
|
|
|
|
assert_raise(TypeError) { Marshal.load(m) }
|
|
|
|
eval("C3 = Struct.new(:foo, :baz)")
|
|
|
|
assert_raise(TypeError) { Marshal.load(m) }
|
|
|
|
end
|
2008-06-05 10:57:05 -04:00
|
|
|
|
|
|
|
class C4
|
|
|
|
def initialize(gc)
|
|
|
|
@gc = gc
|
|
|
|
end
|
|
|
|
def _dump(s)
|
|
|
|
GC.start if @gc
|
|
|
|
"foo"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_gc
|
|
|
|
assert_nothing_raised do
|
|
|
|
Marshal.dump((0..1000).map {|x| C4.new(x % 50 == 25) })
|
|
|
|
end
|
|
|
|
end
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 03:25:05 -04:00
|
|
|
|
|
|
|
def test_taint_and_untrust
|
|
|
|
x = Object.new
|
|
|
|
x.taint
|
|
|
|
x.untrust
|
|
|
|
s = Marshal.dump(x)
|
|
|
|
assert_equal(true, s.tainted?)
|
|
|
|
assert_equal(true, s.untrusted?)
|
|
|
|
y = Marshal.load(s)
|
|
|
|
assert_equal(true, y.tainted?)
|
|
|
|
assert_equal(true, y.untrusted?)
|
|
|
|
end
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|