diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-02-21 15:32:06 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-02-21 15:32:06 +0000 |
| commit | f5241f165ff4da42ffdcbfc00af189cb0066fca9 (patch) | |
| tree | f18a19f98b3474d8a8bce555a9ed27b2f414ee92 | |
| parent | c6cb1598be5a57fe418f3fda6c444923da8e7df1 (diff) | |
| download | php-git-f5241f165ff4da42ffdcbfc00af189cb0066fca9.tar.gz | |
Fixed bug #36458 (sleep() accepts negative values).
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 16 |
2 files changed, 10 insertions, 7 deletions
@@ -25,6 +25,7 @@ PHP NEWS (Mike) - Fixed tiger hash algorithm generating wrong results on big endian platforms. (Mike) +- Fixed bug #36458 (sleep() accepts negative values). (Ilia) - Fixed bug #36436 (DBA problem with Berkeley DB4). (Marcus) - Fixed bug #36434 (Improper resolution of declaring class name of an inherited property). (Ilia) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 0c5e614df5..2ff5bb83f6 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1747,17 +1747,19 @@ PHP_FUNCTION(flush) Delay for a given number of seconds */ PHP_FUNCTION(sleep) { - zval **num; + long num; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num) == FAILURE) { + RETURN_FALSE; + } + if (num < 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of seconds must be greater than or equal to 0"); + RETURN_FALSE; } - - convert_to_long_ex(num); #ifdef PHP_SLEEP_NON_VOID - RETURN_LONG(php_sleep(Z_LVAL_PP(num))); + RETURN_LONG(php_sleep(num)); #else - php_sleep(Z_LVAL_PP(num)); + php_sleep(num); #endif } |