[pull] master from php:master

ext/simplexml/simplexml.c

@@ -580,7 +580,10 @@ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value,
 				if (!member || Z_TYPE_P(member) == IS_LONG) {
 					newnode = xmlNewTextChild(mynode->parent, mynode->ns, mynode->name, value_str ? (xmlChar *)ZSTR_VAL(value_str) : NULL);
 				} else {
-					newnode = xmlNewTextChild(mynode, mynode->ns, (xmlChar *)Z_STRVAL_P(member), value_str ? (xmlChar *)ZSTR_VAL(value_str) : NULL);
+					/* Note: we cannot set the namespace here unconditionally because the parent may be a document.
+					 * Passing NULL will let libxml decide to either inherit the namespace or not set one at all,
+					 * depending on whether the parent is an element. */
+					newnode = xmlNewTextChild(mynode, NULL, (xmlChar *)Z_STRVAL_P(member), value_str ? (xmlChar *)ZSTR_VAL(value_str) : NULL);
 				}
 			} else if (!member || Z_TYPE_P(member) == IS_LONG) {
 				if (member && cnt < Z_LVAL_P(member)) {

ext/simplexml/tests/gh17153.phpt

@@ -0,0 +1,45 @@
+--TEST--
+GH-17153 (SimpleXML crash when using autovivification on document)
+--EXTENSIONS--
+dom
+simplexml
+xsl
+--FILE--
+<?php
+$sxe = simplexml_load_file(__DIR__ . '/../../xsl/tests/53965/collection.xml', SimpleXMLElement::class);
+$processor = new XSLTProcessor;
+$dom = new DOMDocument;
+$dom->load(__DIR__ . '/../../xsl/tests/53965/collection.xsl');
+$processor->importStylesheet($dom);
+$result = $processor->transformToDoc($sxe, SimpleXMLElement::class);
+$result->h = "x";
+var_dump($result);
+?>
+--EXPECT--
+object(SimpleXMLElement)#4 (4) {
+  ["h1"]=>
+  array(2) {
+    [0]=>
+    string(19) "Fight for your mind"
+    [1]=>
+    string(17) "Electric Ladyland"
+  }
+  ["h2"]=>
+  array(2) {
+    [0]=>
+    string(20) "by Ben Harper - 1995"
+    [1]=>
+    string(22) "by Jimi Hendrix - 1997"
+  }
+  ["hr"]=>
+  array(2) {
+    [0]=>
+    object(SimpleXMLElement)#5 (0) {
+    }
+    [1]=>
+    object(SimpleXMLElement)#6 (0) {
+    }
+  }
+  ["h"]=>
+  string(1) "x"
+}

win32/build/phpize.bat

@@ -1,6 +1,7 @@
 @echo off
 SET PHP_BUILDCONF_PATH=%~dp0
 cscript /nologo /e:jscript %PHP_BUILDCONF_PATH%\script\phpize.js %*
+IF ERRORLEVEL 0 exit /b 3
 IF NOT EXIST configure.bat (
 	echo Error generating configure script, configure script was not copied
 	exit /b 3

win32/build/phpize.js.in

@@ -17,6 +17,7 @@
 // This generates a configure script for win32 build
 
 var STDOUT = WScript.StdOut;
+var STDERR = WScript.StdErr;
 
 var FSO = WScript.CreateObject("Scripting.FileSystemObject");
 var C = FSO.CreateTextFile("configure.js", true);
@@ -201,6 +202,13 @@ function buildconf_process_args()
 if (buildconf_process_args() == 0) {
 	WScript.Quit(3);
 }
+
+if (FSO.FileExists("config.w32")) {
+	STDERR.WriteLine("Cannot find config.w32");
+	STDERR.WriteLine("Must be run from the root of the extension source");
+	WScript.Quit(10);
+}
+
 STDOUT.WriteLine("Rebuilding configure.js");
 STDOUT.WriteLine(PHP_DIR);