From 1d5eff07f3a5c1ff74cf9d0660895fb0764d1ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Thu, 25 Nov 2010 16:44:20 +0000 Subject: - Fixed bug #53403 (use of unitialized values). Fixes the fix for bug #46587. - Added test for bug #46587. --- ext/standard/rand.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'ext/standard/rand.c') diff --git a/ext/standard/rand.c b/ext/standard/rand.c index 8cd130d969..5658d3c70c 100644 --- a/ext/standard/rand.c +++ b/ext/standard/rand.c @@ -315,18 +315,19 @@ PHP_FUNCTION(mt_rand) long number; int argc = ZEND_NUM_ARGS(); - if (argc != 0 && zend_parse_parameters(argc TSRMLS_CC, "ll", &min, &max) == FAILURE) - return; + if (argc != 0) { + if (zend_parse_parameters(argc TSRMLS_CC, "ll", &min, &max) == FAILURE) { + return; + } else if (max < min) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "max(%ld) is smaller than min(%ld)", max, min); + RETURN_FALSE; + } + } if (!BG(mt_rand_is_seeded)) { php_mt_srand(GENERATE_SEED() TSRMLS_CC); } - if (max < min) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "max(%ld) is smaller than min(%ld)", max, min); - RETURN_FALSE; - } - /* * Melo: hmms.. randomMT() returns 32 random bits... * Yet, the previous php_rand only returns 31 at most. -- cgit v1.2.1