Merge branch 'PHP-7.2' into PHP-7.3

Author: nikic

NEWS

@@ -61,6 +61,8 @@ PHP                                                                        NEWS
 
 - Standard:
   . Fixed bug #77395 (segfault about array_multisort). (Laruence)
+  . Fixed bug #77439 (parse_str segfaults when inserting item into existing
+    array). (Nikita)
 
 10 Jan 2019, PHP 7.3.1
 

ext/standard/tests/strings/bug77439.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Bug #77439: parse_str segfaults when inserting item into existing array
+--FILE--
+<?php
+$a = [];
+parse_str('a[1]=1');
+var_dump($a);
+?>
+--EXPECTF--
+Deprecated: parse_str(): Calling parse_str() without the result argument is deprecated in %s on line %d
+array(1) {
+  [1]=>
+  string(1) "1"
+}

main/php_variables.c

@@ -224,6 +224,8 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars
 					if (Z_TYPE_P(gpc_element_p) != IS_ARRAY) {
 						zval_ptr_dtor_nogc(gpc_element_p);
 						array_init(gpc_element_p);
+					} else {
+						SEPARATE_ARRAY(gpc_element_p);
 					}
 				}
 			}