diff options
| author | Derick Rethans <derick@php.net> | 2005-12-29 10:54:07 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2005-12-29 10:54:07 +0000 |
| commit | 25aeeb5e256b7b39e5ecbdd5bd8ba239affa005b (patch) | |
| tree | c2efb846db43312ccda6e12bb636f7bd7d23d2d9 | |
| parent | a5acdfc5f22c753b7699abd45c98bd870b400efb (diff) | |
| download | php-git-25aeeb5e256b7b39e5ecbdd5bd8ba239affa005b.tar.gz | |
- Fixed bug #35751 (using date with a timestamp makes httpd segfault).
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/date/php_date.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index a4cf8202ca..cbc5a5dec8 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -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) { |