From 6b73b2d6ebede318b5baa21ffae8aa3744762958 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 4 Aug 2017 22:17:34 +0200
Subject: [PATCH] Check for empty string in mb_ord()

---
 ext/mbstring/mbstring.c            | 5 +++++
 ext/mbstring/tests/mb_chr_ord.phpt | 9 ++++++++-
 ext/mbstring/tests/mb_ord.phpt     | 6 +++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 57e438429d..d2e778bff5 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 613f2e7f42..153699b1b0 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 25249dae3c..b42bd05425 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)
-- 
2.50.1