Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit d3c95db18c5a · 2019-05-17T13:32:53.000+02:00
* PHP-7.3:
  Fix #78025: segfault when accessing properties of DOMDocumentType
diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c
@@ -50,7 +50,7 @@ int dom_documenttype_name_read(dom_object *obj, zval *retval)
 		return FAILURE;
 	}
 
-	ZVAL_STRING(retval, (char *) (dtdptr->name));
+	ZVAL_STRING(retval, dtdptr->name ? (char *) (dtdptr->name) : "");
 
 	return SUCCESS;
 }
diff --git a/ext/dom/tests/bug78025.phpt b/ext/dom/tests/bug78025.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #78025 (segfault when accessing properties of DOMDocumentType)
+--SKIPIF--
+<?php
+if (!extension_loaded('dom')) die('skip dom extension not available');
+?>
+--FILE--
+<?php
+$htm = "<!DOCTYPE><html></html>";
+$dom = new DOMDocument;
+$dom->loadHTML($htm);
+var_dump($dom->doctype->name);
+?>
+===DONE===
+--EXPECTF--
+Warning: DOMDocument::loadHTML(): htmlParseDocTypeDecl : no DOCTYPE name ! in Entity, line: 1 in %s on line %d
+string(0) ""
+===DONE===

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ int dom_documenttype_name_read(dom_object obj, zval retval)`
`50`	`50`	`return FAILURE;`
`51`	`51`	`}`
`52`	`52`
`53`		`- ZVAL_STRING(retval, (char *) (dtdptr->name));`
	`53`	`+ ZVAL_STRING(retval, dtdptr->name ? (char *) (dtdptr->name) : "");`
`54`	`54`
`55`	`55`	`return SUCCESS;`
`56`	`56`	`}`