diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-25 15:58:45 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-25 15:58:45 +0100 |
| commit | 0e20220cfce4c993ef047743f526ac97882636c2 (patch) | |
| tree | 02878e97ecb915a72fe8b7bee3d95016a3dbc551 | |
| parent | 0f2b6ece4ea2c4fe5173a40539aabd3ecdbc29f8 (diff) | |
| parent | 717730ddd103c08dd89a47523c96bb97449d0588 (diff) | |
| download | php-git-0e20220cfce4c993ef047743f526ac97882636c2.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77638: var_export'ing certain class instances segfaults
| -rw-r--r-- | ext/standard/tests/general_functions/bug77638_1.phpt | 13 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/bug77638_2.phpt | 13 | ||||
| -rw-r--r-- | ext/standard/var.c | 4 |
3 files changed, 28 insertions, 2 deletions
diff --git a/ext/standard/tests/general_functions/bug77638_1.phpt b/ext/standard/tests/general_functions/bug77638_1.phpt new file mode 100644 index 0000000000..b5ad2b6acf --- /dev/null +++ b/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( +)) diff --git a/ext/standard/tests/general_functions/bug77638_2.phpt b/ext/standard/tests/general_functions/bug77638_2.phpt new file mode 100644 index 0000000000..b0fbcf724f --- /dev/null +++ b/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( +)) diff --git a/ext/standard/var.c b/ext/standard/var.c index 4987729e3c..e4549cd867 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -550,7 +550,7 @@ again: zend_release_properties(myht); return; } else { - GC_PROTECT_RECURSION(myht); + GC_TRY_PROTECT_RECURSION(myht); } } if (level > 1) { @@ -570,7 +570,7 @@ again: 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) { |