Fixed bug #54454 (substr_compare incorrectly reports equality in some cases)

adoy · adoy · commit 5a8c917c3772 · 2011-04-03T07:18:27.000Z
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -5252,10 +5252,6 @@ PHP_FUNCTION(substr_compare)
 		RETURN_FALSE;
 	}
 
-	if (len > s1_len - offset) {
-		len = s1_len - offset;
-	}
-
 	cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset)));
 
 	if (!cs) {
diff --git a/ext/standard/tests/strings/bug54454.phpt b/ext/standard/tests/strings/bug54454.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Bug #54454 (substr_compare incorrectly reports equality in some cases)
+--FILE--
+<?php
+var_dump(substr_compare('/', '/asd', 0, 4));
+?>
+--EXPECT--
+int(-3)
diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
@@ -27,7 +27,7 @@ int(-1)
 
 Warning: substr_compare(): The start position cannot exceed initial string length in %s on line %d
 bool(false)
-int(0)
+int(-1)
 
 Warning: substr_compare() expects parameter 5 to be boolean, object given in %s on line %d
 bool(false)

Original file line number	Diff line number	Diff line change
`@@ -5252,10 +5252,6 @@ PHP_FUNCTION(substr_compare)`
`5252`	`5252`	`RETURN_FALSE;`
`5253`	`5253`	`}`
`5254`	`5254`
`5255`		`- if (len > s1_len - offset) {`
`5256`		`- len = s1_len - offset;`
`5257`		`- }`
`5258`		`-`
`5259`	`5255`	`cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset)));`
`5260`	`5256`
`5261`	`5257`	`if (!cs) {`