Skip to content

Commit 0078727

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix leak in DateTimeImmutable::modify()
2 parents 24a3d0d + 187f359 commit 0078727

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

ext/date/php_date.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2995,6 +2995,7 @@ PHP_METHOD(DateTimeImmutable, modify)
29952995

29962996
date_clone_immutable(object, &new_object);
29972997
if (!php_date_modify(&new_object, modify, modify_len)) {
2998+
zval_ptr_dtor(&new_object);
29982999
RETURN_FALSE;
29993000
}
30003001

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--TEST--
2+
DateTimeImmutable::modify() with invalid format
3+
--FILE--
4+
<?php
5+
6+
$datetime = new DateTimeImmutable;
7+
var_dump($datetime->modify(''));
8+
9+
?>
10+
--EXPECTF--
11+
Warning: DateTimeImmutable::modify(): Failed to parse time string () at position 0 ( in %s on line %d
12+
bool(false)

0 commit comments

Comments
 (0)