Allow zero length comparison

datibbaw · datibbaw · commit e292391b3899 · 2014-02-21T10:36:40.000+08:00
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -5585,14 +5585,13 @@ PHP_FUNCTION(substr_compare)
 	int s1_len, s2_len;
 	long offset, len=0;
 	zend_bool cs=0;
-	uint cmp_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl|lb", &s1, &s1_len, &s2, &s2_len, &offset, &len, &cs) == FAILURE) {
 		RETURN_FALSE;
 	}
 
-	if (ZEND_NUM_ARGS() >= 4 && len <= 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length must be greater than zero");
+	if (ZEND_NUM_ARGS() >= 4 && len < 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length must be greater than or equal to zero");
 		RETURN_FALSE;
 	}
 
@@ -5606,12 +5605,10 @@ PHP_FUNCTION(substr_compare)
 		RETURN_FALSE;
 	}
 
-	cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset)));
-
 	if (!cs) {
-		RETURN_LONG(zend_binary_strncmp(s1 + offset, (s1_len - offset), s2, s2_len, cmp_len));
+		RETURN_LONG(zend_binary_strncmp(s1 + offset, (s1_len - offset), s2, s2_len, (uint)len));
 	} else {
-		RETURN_LONG(zend_binary_strncasecmp_l(s1 + offset, (s1_len - offset), s2, s2_len, cmp_len));
+		RETURN_LONG(zend_binary_strncasecmp_l(s1 + offset, (s1_len - offset), s2, s2_len, (uint)len));
 	}
 }
 /* }}} */
diff --git a/ext/standard/tests/strings/bug33605.phpt b/ext/standard/tests/strings/bug33605.phpt
@@ -2,10 +2,10 @@
 Bug #33605 (substr_compare crashes)
 --FILE--
 <?php
-$res = substr_compare("aa", "a", -99999999, 0, 0);
+$res = substr_compare("aa", "a", -99999999, -1, 0);
 var_dump($res);
 
 ?>
 --EXPECTF--
-Warning: substr_compare(): The length must be greater than zero in %s on line %d
+Warning: substr_compare(): The length must be greater than or equal to zero in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
@@ -10,9 +10,10 @@ var_dump(substr_compare("abcde", "bc", 1, 3));
 var_dump(substr_compare("abcde", "cd", 1, 2));
 var_dump(substr_compare("abcde", "abc", 5, 1));
 var_dump(substr_compare("abcde", "abcdef", -10, 10));
-
+var_dump(substr_compare("abcde", "abc", 0, 0));
 var_dump(substr_compare("abcde", -1, 0, NULL, new stdClass));
 echo "Test\n";
+var_dump(substr_compare("abcde", "abc", 0, -1));
 var_dump(substr_compare("abcde", "abc", -1, NULL, -5));
 var_dump(substr_compare("abcde", -1, 0, "str", new stdClass));
 
@@ -28,13 +29,15 @@ int(-1)
 Warning: substr_compare(): The start position cannot exceed initial string length in %s on line %d
 bool(false)
 int(-1)
+int(0)
 
 Warning: substr_compare() expects parameter 5 to be boolean, object given in %s on line %d
 bool(false)
 Test
 
-Warning: substr_compare(): The length must be greater than zero in %s on line %d
+Warning: substr_compare(): The length must be greater than or equal to zero in %s on line %d
 bool(false)
+int(0)
 
 Warning: substr_compare() expects parameter 4 to be long, string given in %s on line %d
 bool(false)

Original file line number	Diff line number	Diff line change
`@@ -5585,14 +5585,13 @@ PHP_FUNCTION(substr_compare)`
`5585`	`5585`	`int s1_len, s2_len;`
`5586`	`5586`	`long offset, len=0;`
`5587`	`5587`	`zend_bool cs=0;`
`5588`		`- uint cmp_len;`
`5589`	`5588`
`5590`	`5589`	`if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl\|lb", &s1, &s1_len, &s2, &s2_len, &offset, &len, &cs) == FAILURE) {`
`5591`	`5590`	`RETURN_FALSE;`
`5592`	`5591`	`}`
`5593`	`5592`
`5594`		`- if (ZEND_NUM_ARGS() >= 4 && len <= 0) {`
`5595`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length must be greater than zero");`
	`5593`	`+ if (ZEND_NUM_ARGS() >= 4 && len < 0) {`
	`5594`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length must be greater than or equal to zero");`
`5596`	`5595`	`RETURN_FALSE;`
`5597`	`5596`	`}`
`5598`	`5597`
`@@ -5606,12 +5605,10 @@ PHP_FUNCTION(substr_compare)`
`5606`	`5605`	`RETURN_FALSE;`
`5607`	`5606`	`}`
`5608`	`5607`
`5609`		`- cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset)));`
`5610`		`-`
`5611`	`5608`	`if (!cs) {`
`5612`		`- RETURN_LONG(zend_binary_strncmp(s1 + offset, (s1_len - offset), s2, s2_len, cmp_len));`
	`5609`	`+ RETURN_LONG(zend_binary_strncmp(s1 + offset, (s1_len - offset), s2, s2_len, (uint)len));`
`5613`	`5610`	`} else {`
`5614`		`- RETURN_LONG(zend_binary_strncasecmp_l(s1 + offset, (s1_len - offset), s2, s2_len, cmp_len));`
	`5611`	`+ RETURN_LONG(zend_binary_strncasecmp_l(s1 + offset, (s1_len - offset), s2, s2_len, (uint)len));`
`5615`	`5612`	`}`
`5616`	`5613`	`}`
`5617`	`5614`	`/* }}} */`