mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-18 09:43:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

prevent segv on Windows with negative localtime values.

Browse Source
This commit is contained in:
Ilia Alshanetsky 2002-09-25 12:20:56 +00:00
parent c57d419925
commit 322a24a526
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/standard/datetime.c
View File

@ -194,9 +194,13 @@ void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
}
t = mktime(ta);
if (t == -1) {
#ifdef PHP_WIN32
if (t < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Windows does not support negative values for this function");
RETURN_LONG(-1);
}
#endif
seconds = t - chgsecs;
@ -646,7 +650,15 @@ PHP_FUNCTION(localtime)
assoc_array = Z_LVAL_PP(assoc_array_arg);
break;
}
if (timestamp < 0 || NULL == (ta = php_localtime_r(&timestamp, &tmbuf))) {
#ifdef PHP_WIN32
if (timestamp < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Windows does not support negative values for this function");
RETURN_FALSE
}
#endif
if (NULL == (ta = php_localtime_r(&timestamp, &tmbuf))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid local time");
RETURN_FALSE;
}