XML::Attr.new checks type of Document arg

to avoid unhelpfully segfaulting when dereferencing a pointer to something not-a-Document closes #1477
sparklemotion · Jan 13, 2017 · 5da1984 · 5da1984
1 parent 3330d35
commit 5da1984
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/ext/nokogiri/xml_attr.c b/ext/nokogiri/xml_attr.c
@@ -57,6 +57,10 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &document, &name, &rest);
 
+  if (! rb_obj_is_kind_of(document, cNokogiriXmlDocument)) {
+    rb_raise(rb_eArgError, "parameter must be a Nokogiri::XML::Document");
+  }
+
   Data_Get_Struct(document, xmlDoc, xml_doc);
 
   node = xmlNewDocProp(

diff --git a/test/xml/test_attr.rb b/test/xml/test_attr.rb
@@ -11,6 +11,13 @@ def test_new
         }
       end
 
+      def test_new_raises_argerror_on_nondocument
+        document = Nokogiri::XML "<root><foo/></root>"
+        assert_raises ArgumentError do
+          Nokogiri::XML::Attr.new document.at_css("foo"), "bar"
+        end
+      end
+
       def test_content=
         xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
         address = xml.xpath('//address')[3]