From: Ilia Alshanetsky Date: Thu, 23 Feb 2006 18:28:08 +0000 (+0000) Subject: Fixed bug #35900 (stream_select() should warning when tv_sec is negative). X-Git-Tag: php-5.1.3RC1~79 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d494f9725d7c9f1e19123cdf9fc8f5aa9b4e7ca;p=php Fixed bug #35900 (stream_select() should warning when tv_sec is negative). --- diff --git a/NEWS b/NEWS index 42f8fba510..32b4f58fdb 100644 --- a/NEWS +++ b/NEWS @@ -97,6 +97,8 @@ PHP NEWS - Fixed bug #35998 (SplFileInfo::getPathname() returns unix style filenames in win32). (Marcus) - Fixed bug #35954 (Fatal com_exception casting object). (Rob) +- Fixed bug #35900 (stream_select() should warning when tv_sec is negative). + (Ilia) - Fixed bug #34272 (empty array onto COM object blows up). (Rob) 12 Jan 2006, PHP 5.1.2 diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 72153cb392..fb5ec221c4 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -752,6 +752,14 @@ PHP_FUNCTION(stream_select) if (sec != NULL) { convert_to_long(sec); + if (sec < 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds parameter must be greater then 0."); + RETURN_FALSE; + } else if (usec < 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The microseconds parameter must be greater then 0."); + RETURN_FALSE; + } + /* Solaris + BSD do not like microsecond values which are >= 1 sec */ if (usec > 999999) { tv.tv_sec = Z_LVAL_P(sec) + (usec / 1000000);