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

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 2bd4fdd3881ea6e5bd92f3ff7530b3ecde39ff8a..a4cd45c24dcadc2bdd882765d76605e8a05598c7 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2555,7 +2555,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 2d78c032c5c5a951cc9f47a90c2cc5a16aa46fe8..fc69bd065e19d08442e1084a74e2684f8887a095 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 string, array given, %s(%d)
@@ -165,41 +165,41 @@ Error: 2 - mb_stristr() expects parameter 1 to be string, array given, %s(%d)
 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 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 string, resource given, %s(%d)

diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt
index 62c597f2f787ebe743a43e8f396408fff68f9090..a53642d8f093f061ce11b2b3e283d98fc278ed08 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 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)
@@ -195,7 +195,7 @@ Error: 2 - mb_stristr(): Empty delimiter., %s(%d)
 bool(false)
 
 --instance of classWithToString--
-string(0) ""
+bool(false)
 
 --instance of classWithoutToString--
 Error: 2 - mb_stristr() expects parameter 2 to be string, object given, %s(%d)