Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77638: var_export'ing certain class instances segfaults

Author: cmb69

NEWS

@@ -23,6 +23,9 @@ PHP                                                                        NEWS
 - PCRE:
   . Fixed bug #78853 (preg_match() may return integer > 1). (cmb)
 
+- Standard:
+  . Fixed bug #77638 (var_export'ing certain class instances segfaults). (cmb)
+
 28 Nov 2019, PHP 7.4.0
 
 - Core:

ext/standard/tests/general_functions/bug77638_1.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #77638 (var_export'ing certain class instances segfaults)
+--SKIPIF--
+<?php
+if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
+?>
+--FILE--
+<?php
+var_export(new COM("Scripting.Dictionary"));
+?>
+--EXPECT--
+com::__set_state(array(
+))

ext/standard/tests/general_functions/bug77638_2.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #77638 (var_export'ing certain class instances segfaults)
+--SKIPIF--
+<?php
+if (!extension_loaded('ffi')) die('skip ffi extension not available');
+?>
+--FILE--
+<?php
+var_export(FFI::new('int'));
+?>
+--EXPECT--
+FFI\CData::__set_state(array(
+))

ext/standard/var.c

@@ -557,7 +557,7 @@ PHPAPI void php_var_export_ex(zval *struc, int level, smart_str *buf) /* {{{ */
 					zend_release_properties(myht);
 					return;
 				} else {
-					GC_PROTECT_RECURSION(myht);
+					GC_TRY_PROTECT_RECURSION(myht);
 				}
 			}
 			if (level > 1) {
@@ -577,7 +577,7 @@ PHPAPI void php_var_export_ex(zval *struc, int level, smart_str *buf) /* {{{ */
 				ZEND_HASH_FOREACH_KEY_VAL_IND(myht, index, key, val) {
 					php_object_element_export(val, index, key, level, buf);
 				} ZEND_HASH_FOREACH_END();
-				GC_UNPROTECT_RECURSION(myht);
+				GC_TRY_UNPROTECT_RECURSION(myht);
 				zend_release_properties(myht);
 			}
 			if (level > 1) {