Skip to content

Commit a7fd6fc

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: sapi/phpdbg: use 'h' ZPP specifier instead of'H'
2 parents a103251 + 37e61a0 commit a7fd6fc

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ PHP NEWS
2626
. Fixed bug GH-20442 (Phar does not respect case-insensitiveness of
2727
__halt_compiler() when reading stub). (ndossche, TimWolla)
2828

29+
- PHPDBG:
30+
. Fixed ZPP type violation in phpdbg_get_executable() and phpdbg_end_oplog().
31+
(Girgias)
32+
2933
- Standard:
3034
. Fix memory leak in array_diff() with custom type checks. (ndossche)
3135

sapi/phpdbg/phpdbg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ PHP_FUNCTION(phpdbg_get_executable)
492492
HashTable *files = &PHPDBG_G(file_sources);
493493
HashTable files_tmp;
494494

495-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|H", &options) == FAILURE) {
495+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|h", &options) == FAILURE) {
496496
RETURN_THROWS();
497497
}
498498

@@ -586,7 +586,7 @@ PHP_FUNCTION(phpdbg_end_oplog)
586586
bool by_function = false;
587587
bool by_opcode = false;
588588

589-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|H", &options) == FAILURE) {
589+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|h", &options) == FAILURE) {
590590
RETURN_THROWS();
591591
}
592592

0 commit comments

Comments
 (0)