Fix broken DTD name handling

xml4r · Jan 8, 2024 · 2852b92 · 2852b92
1 parent e38d3b0
commit 2852b92
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/ext/libxml/ruby_xml_dtd.c b/ext/libxml/ruby_xml_dtd.c
@@ -132,8 +132,8 @@ static VALUE rxml_dtd_type(VALUE self)
  *   
  *   * The first usage creates a DTD from a string and requires 1 parameter.
  *   * The second usage loads and parses an external DTD and requires 2 parameters.
- *   * The third usage creates a new internal or external DTD and requires 3 parameters and 2 optional parameters.
- *     It then attaches the DTD to the specified document if it is not nil
+ *   * The third usage creates a new internal or external DTD and requires 2 parameters and 3 optional parameters.
+ *     The DTD is then attached to the specified document if it is not nil.
  * 
  * Parameters:
  * 
@@ -160,16 +160,19 @@ static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
           xmlDocPtr xdoc = NULL;
 
           VALUE name, doc, internal;
-          rb_scan_args(argc, argv, "32", &external, &system, &name, &doc, &internal);
+          rb_scan_args(argc, argv, "23", &external, &system, &name, &doc, &internal);
 
           Check_Type(external, T_STRING);
           xpublic = (const xmlChar*) StringValuePtr(external);
 
           Check_Type(system, T_STRING);
           xsystem = (const xmlChar*) StringValuePtr(system);
 
-          Check_Type(name, T_STRING);
-          xname = (const xmlChar*) StringValuePtr(name);
+          if (name != Qnil)
+          {
+            Check_Type(name, T_STRING);
+            xname = (const xmlChar*)StringValuePtr(name);
+          }
 
           if (doc != Qnil)
           {

diff --git a/test/test_document.rb b/test/test_document.rb
@@ -82,7 +82,7 @@ def test_doc_node_type_name
   def test_xhtml
 		doc = LibXML::XML::Document.new
 		assert(!doc.xhtml?)
-    LibXML::XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, doc, true
+    LibXML::XML::Dtd.new("-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, doc, true)
 		assert(doc.xhtml?)
   end