Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit a957e84c58d8 · 2020-02-13T15:17:25.000+01:00
* PHP-7.4:
  Fix #77569: Write Acess Violation in DomImplementation
diff --git a/ext/dom/document.c b/ext/dom/document.c
@@ -194,7 +194,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval)
 		return FAILURE;
 	}
 
-	handler = xmlFindCharEncodingHandler(Z_STRVAL_P(newval));
+	handler = xmlFindCharEncodingHandler(ZSTR_VAL(str));
 
     if (handler != NULL) {
 		xmlCharEncCloseFunc(handler);
diff --git a/ext/dom/tests/bug77569.phpt b/ext/dom/tests/bug77569.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #77569 (Write Acess Violation in DomImplementation)
+--SKIPIF--
+<?php
+if (!extension_loaded('dom')) die('skip dom extension not available');
+?>
+--FILE--
+<?php
+$imp = new DOMImplementation;
+$dom = $imp->createDocument("", "");
+$dom->encoding = null;
+?>
+--EXPECTF--
+Warning: main(): Invalid Document Encoding in %s on line %d

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ int dom_document_encoding_write(dom_object obj, zval newval)`
`194`	`194`	`return FAILURE;`
`195`	`195`	`}`
`196`	`196`
`197`		`- handler = xmlFindCharEncodingHandler(Z_STRVAL_P(newval));`
	`197`	`+ handler = xmlFindCharEncodingHandler(ZSTR_VAL(str));`
`198`	`198`
`199`	`199`	`if (handler != NULL) {`
`200`	`200`	`xmlCharEncCloseFunc(handler);`