com php-src: Check for empty string in mb_ord(): ext/ mbstring/mbstring.c ext/mbstring/tests/mb_chr_ord.php t ext/mbstring/tests/mb_ord.phpt
| From: | Nikita Popov | Date: | Fri, 04 Aug 2017 20:20:05 +0000 |
| Subject: | com php-src: Check for empty string in mb_ord(): ext/ mbstring/mbstring.c ext/mbstring/tests/mb_chr_ord.php t ext/mbstring/tests/mb_ord.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98951@lists.php.net to get a copy of this message | ||
Commit: 6b73b2d6ebede318b5baa21ffae8aa3744762958
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 4 Aug 2017 22:17:34 +0200
Parents: aa0e402acf081355dbdb12b56922587a9f59ca35
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b73b2d6ebede318b5baa21ffae8aa3744762958
Log:
Check for empty string in mb_ord()
Changed paths:
M ext/mbstring/mbstring.c
M ext/mbstring/tests/mb_chr_ord.phpt
M ext/mbstring/tests/mb_ord.phpt
Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 57e4384..d2e778b 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -5074,6 +5074,11 @@ static inline zend_long php_mb_ord(const char* str, size_t str_len, const
char*
return -1;
}
+ if (str_len == 0) {
+ php_error_docref(NULL, E_WARNING, "Empty string");
+ return -1;
+ }
+
{
long orig_illegalchars = MBSTRG(illegalchars);
MBSTRG(illegalchars) = 0;
diff --git a/ext/mbstring/tests/mb_chr_ord.phpt b/ext/mbstring/tests/mb_chr_ord.phpt
index 613f2e7..153699b 100644
--- a/ext/mbstring/tests/mb_chr_ord.phpt
+++ b/ext/mbstring/tests/mb_chr_ord.phpt
@@ -6,7 +6,14 @@ mb_chr() and mb_ord()
<?php
ini_set('internal_encoding', 'utf-8');
for($ch = 1; $ch < 80000; $ch++) {
- if ($ch !== mb_ord(mb_chr($ch))) echo "ERROR($ch)\n";
+ $str = mb_chr($ch);
+ if (false === $str) {
+ echo "ERROR($ch)\n";
+ continue;
+ }
+ if ($ch != mb_ord($str)) {
+ echo "REAL ERROR($ch)\n";
+ }
}
echo 'OK';
--EXPECTF--
diff --git a/ext/mbstring/tests/mb_ord..phpt b/ext/mbstring/tests/mb_ord.phpt
index 25249da..b42bd05 100644
--- a/ext/mbstring/tests/mb_ord.phpt
+++ b/ext/mbstring/tests/mb_ord.phpt
@@ -16,7 +16,8 @@ var_dump(
mb_ord("\u{d800}", "pass"),
mb_ord("\u{d800}", "jis"),
mb_ord("\u{d800}", "cp50222"),
- mb_ord("\u{d800}", "utf-7")
+ mb_ord("\u{d800}", "utf-7"),
+ mb_ord("")
);
?>
--EXPECTF--
@@ -33,6 +34,9 @@ Warning: mb_ord(): Unsupported encoding "jis" %s 12
Warning: mb_ord(): Unsupported encoding "cp50222" %s 13
Warning: mb_ord(): Unsupported encoding "utf-7" %s 14
+
+Warning: mb_ord(): Empty string in %s on line %d
+bool(false)
bool(false)
bool(false)
bool(false)