Merge branch 'PHP-7.3' into PHP-7.4

Author: Girgias

ext/mbstring/mbstring.c

@@ -5067,7 +5067,7 @@ static inline zend_string *php_mb_chr(zend_long cp, zend_string *enc_name)
 
 	no_enc = enc->no_encoding;
 	if (php_mb_is_unsupported_no_encoding(no_enc)) {
-		php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", ZSTR_VAL(enc_name));
+		php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc->name);
 		return NULL;
 	}
 

ext/mbstring/tests/bug79441.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #79441 Segfault in mb_chr() if internal encoding is unsupported
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+
+mb_internal_encoding("utf-7");
+mb_chr(0xd800);
+
+?>
+--EXPECTF--
+Warning: mb_chr(): Unsupported encoding "UTF-7" in %s on line %d

ext/mbstring/tests/mb_chr.phpt

@@ -30,11 +30,11 @@ Warning: mb_chr(): Unknown encoding "typo" in %s on line %d
 
 Warning: mb_chr(): Unsupported encoding "pass" in %s on line %d
 
-Warning: mb_chr(): Unsupported encoding "jis" in %s on line %d
+Warning: mb_chr(): Unsupported encoding "JIS" in %s on line %d
 
-Warning: mb_chr(): Unsupported encoding "cp50222" in %s on line %d
+Warning: mb_chr(): Unsupported encoding "CP50222" in %s on line %d
 
-Warning: mb_chr(): Unsupported encoding "utf-7" in %s on line %d
+Warning: mb_chr(): Unsupported encoding "UTF-7" in %s on line %d
 bool(false)
 bool(false)
 bool(false)