MFH: bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not entity)

Add & improve test

3 files changed, 35 insertions, 6 deletions

diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 2ee6e2f2f0..84f1522c20 100644
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -1336,7 +1336,7 @@ static PHP_FUNCTION(xmlwriter_end_dtd_entity)
 }
 /* }}} */
 
-/* {{{ proto bool xmlwriter_write_dtd_entity(resource xmlwriter, string name, string content)
+/* {{{ proto bool xmlwriter_write_dtd_entity(resource xmlwriter, string name, string content [, int pe [, string pubid [, string sysid [, string ndataid]]]])
 Write full DTD Entity tag - returns FALSE on error */
 static PHP_FUNCTION(xmlwriter_write_dtd_entity)
 {
@@ -1345,21 +1345,26 @@ static PHP_FUNCTION(xmlwriter_write_dtd_entity)
 	xmlTextWriterPtr ptr;
 	char *name, *content;
 	int name_len, content_len, retval;
+	/* Optional parameters */
+	char *pubid = NULL, *sysid = NULL, *ndataid = NULL;
+	int pe = 0, pubid_len, sysid_len, ndataid_len;
 
 #ifdef ZEND_ENGINE_2
 	zval *this = getThis();
 
 	if (this) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss",
-			&name, &name_len, &content, &content_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|lsss",
+			&name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len,
+			&sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) {
 			return;
 		}
 		XMLWRITER_FROM_OBJECT(intern, this);
 	} else
 #endif
 	{
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &pind, 
-			&name, &name_len, &content, &content_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|lsss", &pind, 
+			&name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len,
+			&sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) {
 			return;
 		}
 		ZEND_FETCH_RESOURCE(intern,xmlwriter_object *, &pind, -1, "XMLWriter", le_xmlwriter);
@@ -1370,7 +1375,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd_entity)
 	ptr = intern->ptr;
 
 	if (ptr) {
-		retval = xmlTextWriterWriteDTDAttlist(ptr, (xmlChar *)name, (xmlChar *)content);
+		retval = xmlTextWriterWriteDTDEntity(ptr, pe, (xmlChar *)name, (xmlChar *)pubid, (xmlChar *)sysid, (xmlChar *)ndataid, (xmlChar *)content);
 		if (retval != -1) {
 			RETURN_TRUE;
 		}
diff --git a/ext/xmlwriter/tests/008.phpt b/ext/xmlwriter/tests/008.phpt
index 6226e8ec16..88768b1130 100644
--- a/ext/xmlwriter/tests/008.phpt
+++ b/ext/xmlwriter/tests/008.phpt
@@ -11,6 +11,10 @@ if (!extension_loaded("xmlwriter")) die("skip");
 $xw = xmlwriter_open_memory();
 xmlwriter_set_indent($xw, TRUE);
 xmlwriter_start_document($xw, NULL, "UTF-8");
+xmlwriter_start_dtd_entity($xw, "ent", false);
+xmlwriter_text($xw, "val");
+xmlwriter_end_dtd_entity($xw);
+xmlwriter_write_dtd_entity($xw, "ent2", "val2");
 xmlwriter_write_dtd_element($xw, 'sxe', '(elem1+, elem11, elem22*)');
 xmlwriter_write_dtd_attlist($xw, 'sxe', 'id     CDATA  #implied');
 xmlwriter_start_dtd_element($xw, 'elem1');
@@ -27,6 +31,8 @@ print $output;
 ?>
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
+<!ENTITY ent "val">
+<!ENTITY ent2 "val2">
 <!ELEMENT sxe (elem1+, elem11, elem22*)>
 <!ATTLIST sxe id     CDATA  #implied>
 <!ELEMENT elem1 elem2*>
diff --git a/ext/xmlwriter/tests/bug39504.phpt b/ext/xmlwriter/tests/bug39504.phpt
new file mode 100644
index 0000000000..3b70f6a2f2
--- /dev/null
+++ b/ext/xmlwriter/tests/bug39504.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not enity)
+--FILE--
+<?php
+
+$xw = xmlwriter_open_memory();
+xmlwriter_start_document($xw, NULL, "UTF-8");
+xmlwriter_start_dtd($xw, "root");
+xmlwriter_write_dtd_entity($xw, "ent2", "val2");
+xmlwriter_end_dtd($xw);
+xmlwriter_start_element($xw, "root");
+xmlwriter_end_document($xw);
+print xmlwriter_flush($xw, true);
+
+?>
+--EXPECTF--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE root [<!ENTITY ent2 "val2">]><root/>