- Bug #46763 (mb_stristr() wrong output when needle does not exist) (patch by Henriqu...

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 67ba1cba96a78db77ab0a34b73e78aa6f891441d..a127cc956db7ff12ec38976594b7bd6ab9f59de4 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2386,7 +2386,8 @@ PHP_FUNCTION(mb_strrchr)
 PHP_FUNCTION(mb_stristr)
 {
        zend_bool part = 0;
-       unsigned int n, from_encoding_len, len, mblen;
+       unsigned int from_encoding_len, len, mblen;
+       int n;
        mbfl_string haystack, needle, result, *ret = NULL;
        const char *from_encoding = mbfl_no2preferred_mime_name(MBSTRG(current_internal_encoding));
        mbfl_string_init(&haystack);

diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt
index d44275ce2dca04b5790dc4b07b9a13f89d6792eb..4b9a9465c027d3515f7a1e3c1ec72a84a698d44d 100644 (file)
--- a/ext/mbstring/tests/mb_stristr_variation1.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation1.phpt
@@ -122,31 +122,31 @@ fclose($fp);
 *** Testing mb_stristr() : usage variation ***
 
 --int 0--
-string(0) ""
+bool(false)
 
 --int 1--
-string(0) ""
+bool(false)
 
 --int 12345--
-string(0) ""
+bool(false)
 
 --int -12345--
-string(0) ""
+bool(false)
 
 --float 10.5--
-string(0) ""
+bool(false)
 
 --float -10.5--
-string(0) ""
+bool(false)
 
 --float 12.3456789000e10--
-string(0) ""
+bool(false)
 
 --float -12.3456789000e10--
-string(0) ""
+bool(false)
 
 --float .5--
-string(0) ""
+bool(false)
 
 --empty array--
 Error: 2 - mb_stristr() expects parameter 1 to be binary string, array given, %s(%d)
@@ -165,41 +165,41 @@ Error: 2 - mb_stristr() expects parameter 1 to be binary string, array given, %s
 bool(false)
 
 --uppercase NULL--
-string(0) ""
+bool(false)
 
 --lowercase null--
-string(0) ""
+bool(false)
 
 --lowercase true--
-string(0) ""
+bool(false)
 
 --lowercase false--
-string(0) ""
+bool(false)
 
 --uppercase TRUE--
-string(0) ""
+bool(false)
 
 --uppercase FALSE--
-string(0) ""
+bool(false)
 
 --empty string DQ--
-string(0) ""
+bool(false)
 
 --empty string SQ--
-string(0) ""
+bool(false)
 
 --instance of classWithToString--
-string(0) ""
+bool(false)
 
 --instance of classWithoutToString--
 Error: 2 - mb_stristr() expects parameter 1 to be binary string, object given, %s(%d)
 bool(false)
 
 --undefined var--
-string(0) ""
+bool(false)
 
 --unset var--
-string(0) ""
+bool(false)
 
 --resource--
 Error: 2 - mb_stristr() expects parameter 1 to be binary string, resource given, %s(%d)

diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt
index 921d98e305738aae9c7d2b9e027189c811a48596..e33f2f7b82858d668112ea94162d05290f4426c4 100644 (file)
--- a/ext/mbstring/tests/mb_stristr_variation2.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation2.phpt
@@ -122,31 +122,31 @@ fclose($fp);
 *** Testing mb_stristr() : usage variation ***
 
 --int 0--
-string(0) ""
+bool(false)
 
 --int 1--
-string(0) ""
+bool(false)
 
 --int 12345--
-string(0) ""
+bool(false)
 
 --int -12345--
-string(0) ""
+bool(false)
 
 --float 10.5--
-string(0) ""
+bool(false)
 
 --float -10.5--
-string(0) ""
+bool(false)
 
 --float 12.3456789000e10--
-string(0) ""
+bool(false)
 
 --float -12.3456789000e10--
-string(0) ""
+bool(false)
 
 --float .5--
-string(0) ""
+bool(false)
 
 --empty array--
 Error: 2 - mb_stristr() expects parameter 2 to be binary string, array given, %s(%d)
@@ -173,14 +173,14 @@ Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
 bool(false)
 
 --lowercase true--
-string(0) ""
+bool(false)
 
 --lowercase false--
 Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
 bool(false)
 
 --uppercase TRUE--
-string(0) ""
+bool(false)
 
 --uppercase FALSE--
 Error: 2 - mb_stristr(): Empty delimiter., %s(%d)