Skip to content

Warning promotion: Throw on writing invalid XML tag names #6233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions ext/xmlwriter/php_xmlwriter.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ static zend_object *xmlwriter_object_new(zend_class_entry *class_type)
}
/* }}} */

#define XMLW_NAME_CHK(__err) \
#define XMLW_NAME_CHK(__arg_no, __subject) \
if (xmlValidateName((xmlChar *) name, 0) != 0) { \
php_error_docref(NULL, E_WARNING, "%s", __err); \
RETURN_FALSE; \
zend_argument_value_error(__arg_no, "must be a valid %s, \"%s\" given", __subject, name); \
RETURN_THROWS(); \
} \

/* {{{ function prototypes */
Expand Down Expand Up @@ -199,7 +199,7 @@ static void xmlwriter_objects_clone(void *object, void **object_clone)
}
}}} */

static void php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_one_char_t internal_function, char *err_string)
static void php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_one_char_t internal_function, char *subject_name)
{
xmlTextWriterPtr ptr;
char *name;
Expand All @@ -212,8 +212,8 @@ static void php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_rea
}
XMLWRITER_FROM_OBJECT(ptr, self);

if (err_string != NULL) {
XMLW_NAME_CHK(err_string);
if (subject_name != NULL) {
XMLW_NAME_CHK(2, subject_name);
}

if (ptr) {
Expand Down Expand Up @@ -281,7 +281,7 @@ PHP_FUNCTION(xmlwriter_set_indent_string)
/* {{{ Create start attribute - returns FALSE on error */
PHP_FUNCTION(xmlwriter_start_attribute)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartAttribute, "Invalid Attribute Name");
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartAttribute, "attribute name");
}
/* }}} */

Expand All @@ -307,7 +307,7 @@ PHP_FUNCTION(xmlwriter_start_attribute_ns)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Attribute Name");
XMLW_NAME_CHK(3, "attribute name");

if (ptr) {
retval = xmlTextWriterStartAttributeNS(ptr, (xmlChar *)prefix, (xmlChar *)name, (xmlChar *)uri);
Expand Down Expand Up @@ -335,7 +335,7 @@ PHP_FUNCTION(xmlwriter_write_attribute)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Attribute Name");
XMLW_NAME_CHK(2, "attribute name");

if (ptr) {
retval = xmlTextWriterWriteAttribute(ptr, (xmlChar *)name, (xmlChar *)content);
Expand Down Expand Up @@ -363,7 +363,7 @@ PHP_FUNCTION(xmlwriter_write_attribute_ns)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Attribute Name");
XMLW_NAME_CHK(3, "attribute name");

if (ptr) {
retval = xmlTextWriterWriteAttributeNS(ptr, (xmlChar *)prefix, (xmlChar *)name, (xmlChar *)uri, (xmlChar *)content);
Expand All @@ -379,7 +379,7 @@ PHP_FUNCTION(xmlwriter_write_attribute_ns)
/* {{{ Create start element tag - returns FALSE on error */
PHP_FUNCTION(xmlwriter_start_element)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartElement, "Invalid Element Name");
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartElement, "element name");
}
/* }}} */

Expand All @@ -398,7 +398,7 @@ PHP_FUNCTION(xmlwriter_start_element_ns)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Element Name");
XMLW_NAME_CHK(3, "element name");

if (ptr) {
retval = xmlTextWriterStartElementNS(ptr, (xmlChar *)prefix, (xmlChar *)name, (xmlChar *)uri);
Expand Down Expand Up @@ -441,7 +441,7 @@ PHP_FUNCTION(xmlwriter_write_element)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Element Name");
XMLW_NAME_CHK(2, "element name");

if (ptr) {
if (!content) {
Expand Down Expand Up @@ -480,7 +480,7 @@ PHP_FUNCTION(xmlwriter_write_element_ns)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Element Name");
XMLW_NAME_CHK(3, "element name");

if (ptr) {
if (!content) {
Expand All @@ -507,7 +507,7 @@ PHP_FUNCTION(xmlwriter_write_element_ns)
/* {{{ Create start PI tag - returns FALSE on error */
PHP_FUNCTION(xmlwriter_start_pi)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartPI, "Invalid PI Target");
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartPI, "PI target");
}
/* }}} */

Expand All @@ -533,7 +533,7 @@ PHP_FUNCTION(xmlwriter_write_pi)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid PI Target");
XMLW_NAME_CHK(2, "PI target");

if (ptr) {
retval = xmlTextWriterWritePI(ptr, (xmlChar *)name, (xmlChar *)content);
Expand Down Expand Up @@ -726,7 +726,7 @@ PHP_FUNCTION(xmlwriter_write_dtd)
/* {{{ Create start DTD element - returns FALSE on error */
PHP_FUNCTION(xmlwriter_start_dtd_element)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartDTDElement, "Invalid Element Name");
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartDTDElement, "element name");
}
/* }}} */

Expand All @@ -752,7 +752,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_element)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Element Name");
XMLW_NAME_CHK(2, "element name");

if (ptr) {
retval = xmlTextWriterWriteDTDElement(ptr, (xmlChar *)name, (xmlChar *)content);
Expand All @@ -768,7 +768,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_element)
/* {{{ Create start DTD AttList - returns FALSE on error */
PHP_FUNCTION(xmlwriter_start_dtd_attlist)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartDTDAttlist, "Invalid Element Name");
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartDTDAttlist, "element name");
}
/* }}} */

Expand All @@ -794,7 +794,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_attlist)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Element Name");
XMLW_NAME_CHK(2, "element name");

if (ptr) {
retval = xmlTextWriterWriteDTDAttlist(ptr, (xmlChar *)name, (xmlChar *)content);
Expand Down Expand Up @@ -822,7 +822,7 @@ PHP_FUNCTION(xmlwriter_start_dtd_entity)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Attribute Name");
XMLW_NAME_CHK(2, "attribute name");

if (ptr) {
retval = xmlTextWriterStartDTDEntity(ptr, isparm, (xmlChar *)name);
Expand Down Expand Up @@ -862,7 +862,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_entity)
}
XMLWRITER_FROM_OBJECT(ptr, self);

XMLW_NAME_CHK("Invalid Element Name");
XMLW_NAME_CHK(2, "element name");

if (ptr) {
retval = xmlTextWriterWriteDTDEntity(ptr, pe, (xmlChar *)name, (xmlChar *)pubid, (xmlChar *)sysid, (xmlChar *)ndataid, (xmlChar *)content);
Expand Down
27 changes: 19 additions & 8 deletions ext/xmlwriter/tests/010.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,27 @@ $xw = xmlwriter_open_uri($file);
var_dump(xmlwriter_start_element($xw, "tag"));
var_dump(xmlwriter_start_attribute($xw, "attr"));
var_dump(xmlwriter_end_attribute($xw));
var_dump(xmlwriter_start_attribute($xw, "-1"));

try {
xmlwriter_start_attribute($xw, "-1");
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}

var_dump(xmlwriter_end_attribute($xw));
var_dump(xmlwriter_start_attribute($xw, "\""));

try {
xmlwriter_start_attribute($xw, "\"");
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}

var_dump(xmlwriter_end_attribute($xw));
var_dump(xmlwriter_end_element($xw));

// Force to write and empty the buffer
xmlwriter_flush($xw, empty: true);

unset($xw);

var_dump(file_get_contents($file));
Expand All @@ -32,13 +47,9 @@ echo "Done\n";
bool(true)
bool(true)
bool(true)

Warning: xmlwriter_start_attribute(): Invalid Attribute Name in %s on line %d
bool(false)
bool(false)

Warning: xmlwriter_start_attribute(): Invalid Attribute Name in %s on line %d
xmlwriter_start_attribute(): Argument #2 ($name) must be a valid attribute name, "-1" given
bool(false)
xmlwriter_start_attribute(): Argument #2 ($name) must be a valid attribute name, """ given
bool(false)
bool(true)
string(14) "<tag attr=""/>"
Expand Down