- Fixed bug #35751 (using date with a timestamp makes httpd segfault).

This commit is contained in:
Derick Rethans 2005-12-29 10:54:07 +00:00
parent a5acdfc5f2
commit 25aeeb5e25
2 changed files with 3 additions and 2 deletions

1
NEWS
View File

@ -14,6 +14,7 @@ PHP NEWS
- Fixed bug #35781 (stream_filter_append() can cause segfault). (Tony)
- Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when
column empty). (Andrey)
- Fixed bug #35751 (using date with a timestamp makes httpd segfault). (Derick)
- Fixed bug #35517 (mysql_stmt_fetch returns NULL on data truncation). (Georg)
- Fixed bug #29955 (mb_strtoupper() / lower() broken with Turkish encoding).
(Rui)

View File

@ -561,7 +561,7 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, int localtime)
{
char *format;
int format_len;
time_t ts;
long ts;
char *string;
if (ZEND_NUM_ARGS() == 1) {
@ -721,7 +721,7 @@ PHP_FUNCTION(idate)
{
char *format;
int format_len;
time_t ts;
long ts;
int ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, &format_len, &ts) == FAILURE) {