archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Fixed bug #54283 (new DatePeriod(NULL) causes crash)

Browse source
This commit is contained in:
Felipe Pena 2011-03-23 01:22:18 +00:00
parent 660aa6701d
commit 5b85234b37
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -13,6 +13,7 @@ PHP NEWS
. Fixed bug #54340 (DateTime::add() method bug). (Adam)
. Fixed bug #54316 (DateTime::createFromFormat does not handle trailing '|'
correctly). (Adam)
. Fixed bug #54283 (new DatePeriod(NULL) causes crash). (Felipe)
- DBA extension:
. Fixed bug #54242 (dba_insert returns true if key already exists). (Felipe)

2
ext/date/php_date.c
View file

@ -3767,7 +3767,7 @@ PHP_METHOD(DatePeriod, __construct)
dpobj = zend_object_store_get_object(getThis() TSRMLS_CC);
dpobj->current = NULL;
if (isostr_len) {
if (isostr) {
date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), &recurrences, isostr, isostr_len TSRMLS_CC);
if (dpobj->start == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The ISO interval '%s' did not contain a start date.", isostr);

14
ext/date/tests/bug54283.phpt Normal file
View file

@ -0,0 +1,14 @@
--TEST--
Bug #54283 (new DatePeriod(NULL) causes crash)
--FILE--
<?php
try {
var_dump(new DatePeriod(NULL));
} catch (Exception $e) {
var_dump($e->getMessage());
}
?>
--EXPECTF--
string(51) "DatePeriod::__construct(): Unknown or bad format ()"