File tree Expand file tree Collapse file tree 3 files changed +17
-3
lines changed Expand file tree Collapse file tree 3 files changed +17
-3
lines changed Original file line number Diff line number Diff line change @@ -54,6 +54,9 @@ PHP NEWS
5454 . Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS).
5555 (Mizunashi Mana)
5656
57+ - Sodium:
58+ . Fixed bug #77297 (SodiumException segfaults on PHP 7.3). (Nikita, Scott)
59+
5760- SQLite3:
5861 . Fixed bug #77051 (Issue with re-binding on SQLite3). (BohwaZ)
5962
Original file line number Diff line number Diff line change @@ -387,9 +387,8 @@ static void sodium_remove_param_values_from_backtrace(zend_object *obj) {
387387 ZEND_HASH_FOREACH_VAL (Z_ARRVAL_P (trace ), frame ) {
388388 if (Z_TYPE_P (frame ) == IS_ARRAY ) {
389389 zval * args = zend_hash_str_find (Z_ARRVAL_P (frame ), "args" , sizeof ("args" )- 1 );
390- if (args && Z_TYPE_P (frame ) == IS_ARRAY ) {
391- zend_hash_clean (Z_ARRVAL_P (args ));
392- }
390+ zval_ptr_dtor (args );
391+ ZVAL_EMPTY_ARRAY (args );
393392 }
394393 } ZEND_HASH_FOREACH_END ();
395394 }
Original file line number Diff line number Diff line change @@ -93,6 +93,17 @@ if (defined('SODIUM_BASE64_VARIANT_ORIGINAL')) {
9393 var_dump ('base64("O") case passed ' );
9494 var_dump ('abcd ' );
9595}
96+
97+ function sodium_foo ()
98+ {
99+ throw new SodiumException ('test ' );
100+ }
101+
102+ try {
103+ sodium_foo ();
104+ } catch (SodiumException $ ex ) {
105+ var_dump ($ ex ->getMessage ());
106+ }
96107
97108?>
98109--EXPECT--
@@ -114,3 +125,4 @@ string(25) "base64("O1R") case passed"
114125string(24) "base64("O1") case passed"
115126string(23) "base64("O") case passed"
116127string(4) "abcd"
128+ string(4) "test"
You can’t perform that action at this time.
0 commit comments