Skip to content

Commit e1c8ed6

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: sapi/phpdbg: use 'h' ZPP specifier instead of'H'
2 parents abad39a + a7fd6fc commit e1c8ed6

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
@@ -22,6 +22,10 @@ PHP NEWS
2222
. Fixed bug GH-20442 (Phar does not respect case-insensitiveness of
2323
__halt_compiler() when reading stub). (ndossche, TimWolla)
2424

25+
- PHPDBG:
26+
. Fixed ZPP type violation in phpdbg_get_executable() and phpdbg_end_oplog().
27+
(Girgias)
28+
2529
- Standard:
2630
. Fix memory leak in array_diff() with custom type checks. (ndossche)
2731

sapi/phpdbg/phpdbg.c

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

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

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

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

0 commit comments

Comments
 (0)