From: Anatol Belski <ab@php.net>
Date: Mon, 11 Jan 2016 20:55:54 +0000 (+0100)
Subject: Revert "patch for github PR #1695"
X-Git-Tag: php-7.0.3RC1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66d10fe0857ba7e378eaba80908b27238d194a52;p=php

Revert "patch for github PR #1695"

This reverts commit 58dd956b63e4fd2c9cf8210239cf5e56e3858ff5.

crashes on travis
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index fd08cf624b..30ca0508a9 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2071,17 +2071,6 @@ PHP_FUNCTION(array_fill_keys)
 		zend_hash_real_init(Z_ARRVAL_P(return_value), 1); \
 	} while (0)
 
-#define RANGE_CHECK_LONG_INIT_ARRAY(start, end) do { \
-		__calc_size = (end - start) / lstep; \
-		if (__calc_size >= HT_MAX_SIZE) { \
-			php_error_docref(NULL, E_WARNING, "The supplied range exceeds the maximum array size: start=%pd end=%pd", start, end); \
-			RETURN_FALSE; \
-		} \
-		size = (uint32_t)(__calc_size + 1); \
-		array_init_size(return_value, size); \
-		zend_hash_real_init(Z_ARRVAL_P(return_value), 1); \
-	} while (0)
-
 /* {{{ proto array range(mixed low, mixed high[, int step])
    Create an array containing the range of integers or characters from low to high (inclusive) */
 PHP_FUNCTION(range)
@@ -2223,53 +2212,43 @@ double_str:
 			zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
 		}
 	} else {
-		zend_long low, high;
-		/* lstep is a ulong so that comparisons to it don't overflow, i.e. low - high < lstep */
-		zend_ulong __calc_size, lstep;
-		uint32_t i, size;
+		double low, high;
+		zend_long lstep;
 long_str:
-		low = zval_get_long(zlow);
-		high = zval_get_long(zhigh);
-
-		if (step <= 0) {
-			err = 1;
-			goto err;
-		}
-
-		lstep = step;
+		low = zval_get_double(zlow);
+		high = zval_get_double(zhigh);
+		lstep = (zend_long) step;
 
 		Z_TYPE_INFO(tmp) = IS_LONG;
 		if (low > high) { 		/* Negative steps */
-			if (low - high < lstep) {
+			if (low - high < lstep || lstep <= 0) {
 				err = 1;
 				goto err;
 			}
 
-			RANGE_CHECK_LONG_INIT_ARRAY(high, low);
-
+			RANGE_CHECK_INIT_ARRAY(low, high);
 			ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
-				for (i = 0; i < size; ++i) {
-					Z_LVAL(tmp) = low - (i * lstep);
+				for (; low >= high; low -= lstep) {
+					Z_LVAL(tmp) = (zend_long)low;
 					ZEND_HASH_FILL_ADD(&tmp);
 				}
 			} ZEND_HASH_FILL_END();
 		} else if (high > low) { 	/* Positive steps */
-			if (high - low < lstep) {
+			if (high - low < lstep || lstep <= 0) {
 				err = 1;
 				goto err;
 			}
 
-			RANGE_CHECK_LONG_INIT_ARRAY(low, high);
-
+			RANGE_CHECK_INIT_ARRAY(high, low);
 			ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
-				for (i = 0; i < size; ++i) {
-					Z_LVAL(tmp) = low + (i * lstep);
+				for (; low <= high; low += lstep) {
+					Z_LVAL(tmp) = (zend_long)low;
 					ZEND_HASH_FILL_ADD(&tmp);
 				}
 			} ZEND_HASH_FILL_END();
 		} else {
 			array_init(return_value);
-			Z_LVAL(tmp) = low;
+			Z_LVAL(tmp) = (zend_long)low;
 			zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
 		}
 	}
@@ -2282,7 +2261,6 @@ err:
 /* }}} */
 
 #undef RANGE_CHECK_INIT_ARRAY
-#undef RANGE_CHECK_LONG_INIT_ARRAY
 
 static void php_array_data_shuffle(zval *array) /* {{{ */
 {
diff --git a/ext/standard/tests/array/range_bug71132.phpt b/ext/standard/tests/array/range_bug71132.phpt
deleted file mode 100644
index 5e3bcc8f31..0000000000
--- a/ext/standard/tests/array/range_bug71132.phpt
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Bug #71132 (range function produces 2 segfaults with long integers)
---FILE--
-<?php
-var_dump(count(range(PHP_INT_MIN + 513, PHP_INT_MIN)));
-var_dump(count(range(PHP_INT_MIN, PHP_INT_MIN + 513)));
-?>
---EXPECT--
-int(514)
-int(514)
diff --git a/ext/standard/tests/array/range_bug71197.phpt b/ext/standard/tests/array/range_bug71197.phpt
deleted file mode 100644
index 2031ec7c09..0000000000
--- a/ext/standard/tests/array/range_bug71197.phpt
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Bug #71197 (range function produces another 2 segfaults with long integers)
---FILE--
-<?php
-range(PHP_INT_MIN, PHP_INT_MIN + 513, .01);
-range(PHP_INT_MIN + 513, PHP_INT_MIN, .01);
-?>
---EXPECT--