clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "patch for github PR #1695"

Browse Source 
This reverts commit 58dd956b63.

crashes on travis
This commit is contained in:
Anatol Belski 2016-01-11 21:55:54 +01:00
parent 3bbbd3ebcd
commit 66d10fe085
3 changed files with 14 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ext/standard/array.c
View File

@ -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) /* {{{ */
{

10
ext/standard/tests/array/range_bug71132.phpt
View File

@ -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)

8
ext/standard/tests/array/range_bug71197.phpt
View File

@ -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--