Skip to content

date: Fix Z_PARAM_DATE_TIME_DURATION() error handling #23097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TimWolla merged 1 commit into from
Aug 7, 2026
+20 −4
Merged

date: Fix Z_PARAM_DATE_TIME_DURATION() error handling #23097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ext/date/php_time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ typedef struct php_date_time_duration {

# define Z_DATE_TIME_DURATION_P(zv) php_date_time_duration_from_obj(Z_OBJ_P((zv)))

# define Z_PARAM_DATE_TIME_DURATION(d) do { \
# define Z_PARAM_DATE_TIME_DURATION(d) { \
zend_object *__d; \
Z_PARAM_OBJ_OF_CLASS(__d, php_date_ce_time_duration); \
d = php_date_time_duration_from_obj(__d); \
} while (0);
}

# define Z_PARAM_DATE_TIME_DURATION_OR_NULL(d) do { \
# define Z_PARAM_DATE_TIME_DURATION_OR_NULL(d) { \
zend_object *__d; \
Z_PARAM_OBJ_OF_CLASS_OR_NULL(__d, php_date_ce_time_duration); \
d = __d ? php_date_time_duration_from_obj(__d) : NULL; \
} while (0);
}

PHPAPI extern zend_class_entry *php_date_ce_time_duration;
PHPAPI extern zend_class_entry *php_date_ce_time_timeexception;
Expand Down
16 changes: 16 additions & 0 deletions ext/date/tests/time/duration/z_param_date_time_duration.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--TEST--
Time\Duration: Z_PARAM_DATE_TIME_DURATION() correctly aborts parameter parsing
--FILE--
<?php

require __DIR__ . '/helper.inc';

try {
Time\Duration::compare(1, 2);
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

?>
--EXPECT--
TypeError: Time\Duration::compare(): Argument #1 ($a) must be of type Time\Duration, int given
Loading