Merge pull request #2384 from herwinw/marshal_dump_typeerror

Raise TypeError if _dump returns a non-string

spec/core/marshal/dump_spec.rb

@@ -144,10 +144,8 @@
 
     it "raises a TypeError if _dump returns a non-string" do
       m = mock("marshaled")
-      NATFIXME 'raises a TypeError if _dump returns a non-string', exception: SpecFailedException do
-        m.should_receive(:_dump).and_return(0)
-        -> { Marshal.dump(m) }.should raise_error(TypeError)
-      end
+      m.should_receive(:_dump).and_return(0)
+      -> { Marshal.dump(m) }.should raise_error(TypeError)
     end
 
     it "raises TypeError if an Object is an instance of an anonymous class" do

src/marshal.rb

@@ -257,6 +257,7 @@ def write_user_marshaled_object_without_allocate(value)
       write_char('u')
       write(value.class.to_s.to_sym)
       dump = value.send(:_dump, -1)
+      raise TypeError, '_dump() must return string' unless dump.is_a?(String)
       write_integer_bytes(dump.size)
       write_bytes(value.send(:_dump, -1))
     end