Check types passed in to packer dump methods

tenderlove · Mar 13, 2017 · b8493d7 · b8493d7
1 parent 9feb40f
commit b8493d7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/ext/msgpack/packer_class.c b/ext/msgpack/packer_class.c
@@ -159,27 +159,31 @@ static VALUE Packer_write_float(VALUE self, VALUE obj)
 static VALUE Packer_write_string(VALUE self, VALUE obj)
 {
     PACKER(self, pk);
+    Check_Type(obj, T_STRING);
     msgpack_packer_write_string_value(pk, obj);
     return self;
 }
 
 static VALUE Packer_write_array(VALUE self, VALUE obj)
 {
     PACKER(self, pk);
+    Check_Type(obj, T_ARRAY);
     msgpack_packer_write_array_value(pk, obj);
     return self;
 }
 
 static VALUE Packer_write_hash(VALUE self, VALUE obj)
 {
     PACKER(self, pk);
+    Check_Type(obj, T_HASH);
     msgpack_packer_write_hash_value(pk, obj);
     return self;
 }
 
 static VALUE Packer_write_symbol(VALUE self, VALUE obj)
 {
     PACKER(self, pk);
+    Check_Type(obj, T_SYMBOL);
     msgpack_packer_write_symbol_value(pk, obj);
     return self;
 }
@@ -191,6 +195,7 @@ static VALUE Packer_write_int(VALUE self, VALUE obj)
     if (FIXNUM_P(obj)) {
         msgpack_packer_write_fixnum_value(pk, obj);
     } else {
+        Check_Type(obj, T_BIGNUM);
         msgpack_packer_write_bignum_value(pk, obj);
     }
     return self;
@@ -199,6 +204,7 @@ static VALUE Packer_write_int(VALUE self, VALUE obj)
 static VALUE Packer_write_extension(VALUE self, VALUE obj)
 {
     PACKER(self, pk);
+    Check_Type(obj, T_STRUCT);
 
     int ext_type = FIX2INT(RSTRUCT_GET(obj, 0));
     if(ext_type < -128 || ext_type > 127) {

diff --git a/spec/packer_spec.rb b/spec/packer_spec.rb
@@ -189,6 +189,17 @@ def close
     Array.new.to_msgpack(MessagePack::Packer.new).to_str.should == Array.new.to_msgpack
   end
 
+  it 'raises type error on wrong type' do
+    packer = MessagePack::Packer.new
+    expect { packer.write_float "hello" }.to raise_error(TypeError)
+    expect { packer.write_string 1 }.to raise_error(TypeError)
+    expect { packer.write_array "hello" }.to raise_error(TypeError)
+    expect { packer.write_hash "hello" }.to raise_error(TypeError)
+    expect { packer.write_symbol "hello" }.to raise_error(TypeError)
+    expect { packer.write_int "hello" }.to raise_error(TypeError)
+    expect { packer.write_extension "hello" }.to raise_error(TypeError)
+  end
+
   class CustomPack01
     def to_msgpack(pk=nil)
       return MessagePack.pack(self, pk) unless pk.class == MessagePack::Packer