summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2019-01-06 13:28:30 -0800
committerStanislav Malyshev <stas@php.net>2019-01-06 13:28:30 -0800
commitd0d0d922de02c7b2a248cc943490d7ae77f084be (patch)
treee53289224a6f46c850c3f359a4afa3ab370bbdbe
parentfc02e7e3fea8646960409639d4aba081af7a8506 (diff)
downloadphp-git-d0d0d922de02c7b2a248cc943490d7ae77f084be.tar.gz
Fix tests - newer versions check Unicode
-rw-r--r--ext/mbstring/tests/bug77370.phpt8
-rw-r--r--ext/mbstring/tests/bug77371.phpt5
-rw-r--r--ext/mbstring/tests/bug77381.phpt11
3 files changed, 15 insertions, 9 deletions
diff --git a/ext/mbstring/tests/bug77370.phpt b/ext/mbstring/tests/bug77370.phpt
index c4d25582fe..73f186bc90 100644
--- a/ext/mbstring/tests/bug77370.phpt
+++ b/ext/mbstring/tests/bug77370.phpt
@@ -6,8 +6,6 @@ Bug #77370 (Buffer overflow on mb regex functions - fetch_token)
<?php
var_dump(mb_split(" \xfd",""));
?>
---EXPECT--
-array(1) {
- [0]=>
- string(0) ""
-}
+--EXPECTF--
+Warning: mb_split(): mbregex compile err: invalid code point value in %sbug77370.php on line %d
+bool(false)
diff --git a/ext/mbstring/tests/bug77371.phpt b/ext/mbstring/tests/bug77371.phpt
index 33e5fc115c..2ab04c04f6 100644
--- a/ext/mbstring/tests/bug77371.phpt
+++ b/ext/mbstring/tests/bug77371.phpt
@@ -6,5 +6,6 @@ Bug #77371 (heap buffer overflow in mb regex functions - compile_string_node)
<?php
var_dump(mb_ereg("()0\xfc00000\xfc00000\xfc00000\xfc",""));
?>
---EXPECT--
-bool(false) \ No newline at end of file
+--EXPECTF--
+Warning: mb_ereg(): mbregex compile err: invalid code point value in %sbug77371.php on line %d
+bool(false)
diff --git a/ext/mbstring/tests/bug77381.phpt b/ext/mbstring/tests/bug77381.phpt
index cb83759fc0..3d6dd76a4a 100644
--- a/ext/mbstring/tests/bug77381.phpt
+++ b/ext/mbstring/tests/bug77381.phpt
@@ -9,8 +9,15 @@ var_dump(mb_ereg("(?i)000000000000000000000\xf0",""));
var_dump(mb_ereg("0000\\"."\xf5","0"));
var_dump(mb_ereg("(?i)FFF00000000000000000\xfd",""));
?>
---EXPECT--
-int(1)
+--EXPECTF--
+Warning: mb_ereg(): mbregex compile err: invalid code point value in %sbug77381.php on line %d
bool(false)
+
+Warning: mb_ereg(): mbregex compile err: invalid code point value in %sbug77381.php on line %d
bool(false)
+
+Warning: mb_ereg(): mbregex compile err: invalid code point value in %sbug77381.php on line %d
+bool(false)
+
+Warning: mb_ereg(): mbregex compile err: invalid code point value in %sbug77381.php on line %d
bool(false)