From: Ilia Alshanetsky Date: Mon, 12 Mar 2012 16:53:07 +0000 (+0000) Subject: Fixed bug #60222 (time_nanosleep() does validate input params). X-Git-Tag: PHP-5.4.1-RC1~26^2~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c886ea553d2f7bbfa545046b1b8a01d5390d092;p=php Fixed bug #60222 (time_nanosleep() does validate input params). --- diff --git a/NEWS b/NEWS index 3318144355..a0acb43836 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,7 @@ PHP NEWS . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia) . Fixed bug #60227 (header() cannot detect the multi-line header with CR). (rui, Gustavo) + . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia) . Fixed bug #52719 (array_walk_recursive crashes if third param of the function is by reference). (Nikita Popov) . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 91ec37b32c..99831a1f42 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4497,6 +4497,15 @@ PHP_FUNCTION(time_nanosleep) return; } + if (tv_sec < 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds value must be greater than 0"); + RETURN_FALSE; + } + if (tv_nsec < 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The nanoseconds value must be greater than 0"); + RETURN_FALSE; + } + php_req.tv_sec = (time_t) tv_sec; php_req.tv_nsec = tv_nsec; if (!nanosleep(&php_req, &php_rem)) { diff --git a/ext/standard/tests/time/bug60222.phpt b/ext/standard/tests/time/bug60222.phpt new file mode 100644 index 0000000000..8053a81dea --- /dev/null +++ b/ext/standard/tests/time/bug60222.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #60222 (time_nanosleep() does validate input params) +--FILE-- + +===DONE=== +--EXPECTF-- +Warning: time_nanosleep(): The seconds value must be greater than 0 in %s on line %d +bool(false) + +Warning: time_nanosleep(): The nanoseconds value must be greater than 0 in %s on line %d +bool(false) +===DONE===