raise an exception when bogus values are returned from an IO object

ruby · Jan 16, 2010 · 26fe5a3 · 26fe5a3
1 parent c4fbedc
commit 26fe5a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ext/psych/parser.c b/ext/psych/parser.c
@@ -24,8 +24,9 @@ static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
   *read = 0;
 
   if(! NIL_P(string)) {
+    void * str = (void *)StringValuePtr(string);
     *read = (size_t)RSTRING_LEN(string);
-    memcpy(buf, StringValuePtr(string), *read);
+    memcpy(buf, str, *read);
   }
 
   return 1;

diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb
@@ -26,6 +26,15 @@ def setup
       @parser = Psych::Parser.new EventCatcher.new
     end
 
+    def test_bogus_io
+      o = Object.new
+      def o.read len; self end
+
+      assert_raises(TypeError) do
+        @parser.parse o
+      end
+    end
+
     def test_parse_io
       @parser.parse StringIO.new("--- a")
       assert_called :start_stream