From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sat, 23 Nov 2002 11:27:56 +0000 (+0000)
Subject: Fixed some odd behaviours of range()
X-Git-Tag: RELEASE_1_0b2~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44c98c7e3f83eb907bc383a5d18c435b730cdc03;p=php

Fixed some odd behaviours of range()
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 821c71c5ea..0ee5f9f8e8 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1435,19 +1435,29 @@ PHP_FUNCTION(range)
 
 	/* If the range is given as strings, generate an array of characters. */
 	if (Z_TYPE_P(zlow) == IS_STRING && Z_TYPE_P(zhigh) == IS_STRING) {
-		char *low, *high;
+		unsigned char *low, *high;
 
 		convert_to_string_ex(&zlow);
 		convert_to_string_ex(&zhigh);
-		low = Z_STRVAL_P(zlow);
-		high = Z_STRVAL_P(zhigh);
+		low = (unsigned char *)Z_STRVAL_P(zlow);
+		high = (unsigned char *)Z_STRVAL_P(zhigh);
 
 		if (*low > *high) {		/* Negative steps */
-			for (; *low >= *high; (*low) -= step) {
+			if (*low - *high < step || step <= 0) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "step exceeds the specified range");
+				zval_dtor(return_value);
+				RETURN_FALSE;
+			}
+			for (; *low >= *high; (*low) -= (unsigned int)step) {
 				add_next_index_stringl(return_value, low, 1, 1);
 			}
 		} else {				/* Positive steps */
-			for (; *low <= *high; (*low) += step) {
+			if (*high - *low < step || step <= 0) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "step exceeds the specified range");
+				zval_dtor(return_value);
+				RETURN_FALSE;
+			}
+			for (; *low <= *high; (*low) += (unsigned int)step) {
 				add_next_index_stringl(return_value, low, 1, 1);
 			}
 		}
@@ -1460,10 +1470,20 @@ PHP_FUNCTION(range)
 		high = Z_LVAL_P(zhigh);
 
 		if (low > high) { 		/* Negative steps */
+			if (low - high < step || step <= 0) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "step exceeds the specified range");
+				zval_dtor(return_value);
+				RETURN_FALSE;
+			}
 			for (; low >= high; low -= step) {
 				add_next_index_long(return_value, low);
 			}	
 		} else {				/* Positive steps */
+			if (high - low < step || step <= 0) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "step exceeds the specified range");
+				zval_dtor(return_value);
+				RETURN_FALSE;
+			}
 			for (; low <= high; low += step) {
 				add_next_index_long(return_value, low);
 			}