mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #77297: SodiumException segfaults on PHP 7.3

Browse Source 
Instead of trying to clean the argument arrays from the backtrace, we
overwrite them with empty arrays.
This commit is contained in:
Scott 2018-12-14 22:35:49 +01:00 committed by Christoph M. Becker
parent 0061db5503
commit e0e08d376e
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -54,6 +54,9 @@ PHP NEWS
. Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS).
(Mizunashi Mana)
- Sodium:
. Fixed bug #77297 (SodiumException segfaults on PHP 7.3). (Nikita, Scott)
- SQLite3:
. Fixed bug #77051 (Issue with re-binding on SQLite3). (BohwaZ)

5
ext/sodium/libsodium.c
View File

@ -387,9 +387,8 @@ static void sodium_remove_param_values_from_backtrace(zend_object *obj) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(trace), frame) {
if (Z_TYPE_P(frame) == IS_ARRAY) {
zval *args = zend_hash_str_find(Z_ARRVAL_P(frame), "args", sizeof("args")-1);
if (args && Z_TYPE_P(frame) == IS_ARRAY) {
zend_hash_clean(Z_ARRVAL_P(args));
}
zval_ptr_dtor(args);
ZVAL_EMPTY_ARRAY(args);
}
} ZEND_HASH_FOREACH_END();
}

12
ext/sodium/tests/utils.phpt
View File

@ -93,6 +93,17 @@ if (defined('SODIUM_BASE64_VARIANT_ORIGINAL')) {
var_dump('base64("O") case passed');
var_dump('abcd');
}
function sodium_foo()
{
throw new SodiumException('test');
}
try {
sodium_foo();
} catch (SodiumException $ex) {
var_dump($ex->getMessage());
}
?>
--EXPECT--
@ -114,3 +125,4 @@ string(25) "base64("O1R") case passed"
string(24) "base64("O1") case passed"
string(23) "base64("O") case passed"
string(4) "abcd"
string(4) "test"