Commit 82d71a8

committed

Fix GH-17500: Segfault with requesting nodeName on nameless doctype

1 parent 7da1ea4 commit 82d71a8Copy full SHA for 82d71a8

File tree

+25

-1

lines changed

+25

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ PHP NEWS`
`13`	`13`	`nielsdos)`
`14`	`14`	`. Fixed potential OOB when checking for trailing spaces on Windows. (cmb)`
`15`	`15`
	`16`	`+- DOM:`
	`17`	`+ . Fixed bug GH-17500 (Segfault with requesting nodeName on nameless doctype).`
	`18`	`+ (nielsdos)`
	`19`	`+`
`16`	`20`	`- Enchant:`
`17`	`21`	`. Fix crashes in enchant when passing null bytes. (nielsdos)`
`18`	`22`

Lines changed: 7 additions & 1 deletion

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)`
`98`	`98`	`}`
`99`	`99`	`case XML_DOCUMENT_TYPE_NODE:`
`100`	`100`	`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;`
`101`	`107`	`case XML_PI_NODE:`
`102`	`108`	`case XML_ENTITY_DECL:`
`103`	`109`	`case XML_ENTITY_REF_NODE:`
`104`	`110`	`case XML_NOTATION_NODE:`
`105`		`- ZVAL_STRING(retval, (char *) nodep->name);`
	`111`	`+ ZVAL_STRING(retval, (constchar *) nodep->name);`
`106`	`112`	`break;`
`107`	`113`	`case XML_CDATA_SECTION_NODE:`
`108`	`114`	`ZVAL_STRING(retval, "#cdata-section");`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`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) ""`

Comments

(0)