File tree Expand file tree Collapse file tree 3 files changed +25
-1
lines changed Expand file tree Collapse file tree 3 files changed +25
-1
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,10 @@ PHP NEWS
1313 nielsdos)
1414 . Fixed potential OOB when checking for trailing spaces on Windows. (cmb)
1515
16+ - DOM:
17+ . Fixed bug GH-17500 (Segfault with requesting nodeName on nameless doctype).
18+ (nielsdos)
19+
1620- Enchant:
1721 . Fix crashes in enchant when passing null bytes. (nielsdos)
1822
Original file line number Diff line number Diff line change @@ -98,11 +98,17 @@ int dom_node_node_name_read(dom_object *obj, zval *retval)
9898 }
9999 case XML_DOCUMENT_TYPE_NODE :
100100 case XML_DTD_NODE :
101+ if (nodep -> name ) {
102+ ZVAL_STRING (retval , (const char * ) nodep -> name );
103+ } else {
104+ ZVAL_EMPTY_STRING (retval );
105+ }
106+ break ;
101107 case XML_PI_NODE :
102108 case XML_ENTITY_DECL :
103109 case XML_ENTITY_REF_NODE :
104110 case XML_NOTATION_NODE :
105- ZVAL_STRING (retval , (char * ) nodep -> name );
111+ ZVAL_STRING (retval , (const char * ) nodep -> name );
106112 break ;
107113 case XML_CDATA_SECTION_NODE :
108114 ZVAL_STRING (retval , "#cdata-section" );
Original file line number Diff line number Diff line change 1+ --TEST--
2+ GH-17500 (Segfault with requesting nodeName on nameless doctype)
3+ --EXTENSIONS--
4+ dom
5+ --FILE--
6+ <?php
7+
8+ $ doc = new DOMDocument ();
9+ $ doc ->loadHTML ("<!DOCTYPE> " , LIBXML_NOERROR );
10+ var_dump ($ doc ->doctype ->nodeName );
11+
12+ ?>
13+ --EXPECT--
14+ string(0) ""
You can’t perform that action at this time.
0 commit comments