From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 14 Jan 2019 09:23:44 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.2RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6212835f2c21d6a0dc75bc25b636ce631bff38c;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

d6212835f2c21d6a0dc75bc25b636ce631bff38c
diff --cc NEWS
index c2bb842df6,71f69919ab..951154e5de
--- a/NEWS
+++ b/NEWS
@@@ -25,8 -12,8 +25,10 @@@ PH
    . Fixed bug #77391 (1bpp BMPs may fail to be loaded). (Romain Déoux, cmb)
  
  - Mbstring:
 +  . Fixed bug #77428 (mb_ereg_replace() doesn't replace a substitution
 +    variable). (Nikita)
+   . Fixed bug #77454 (mb_scrub() silently truncates after a null byte).
+     (64796c6e69 at gmail dot com)
  
  - MySQLnd:
    . Fixed bug #75684 (In mysqlnd_ext_plugin.h the plugin methods family has
diff --cc ext/mbstring/mbstring.c
index ae8c4bef7f,9973313985..0e255e98d2
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -5010,23 -5260,21 +5010,22 @@@ PHP_FUNCTION(mb_chr
  /* }}} */
  
  
- static inline char* php_mb_scrub(const char* str, size_t str_len, const mbfl_encoding *enc)
 -static inline char* php_mb_scrub(const char* str, size_t str_len, const char* enc, size_t *ret_len)
++static inline char* php_mb_scrub(const char* str, size_t str_len, const mbfl_encoding *enc, size_t *ret_len)
  {
- 	size_t ret_len;
- 
- 	return php_mb_convert_encoding_ex(str, str_len, enc, enc, &ret_len);
 -	return php_mb_convert_encoding(str, str_len, enc, enc, ret_len);
++	return php_mb_convert_encoding_ex(str, str_len, enc, enc, ret_len);
  }
  
  
  /* {{{ proto string|false mb_scrub([string str[, string encoding]]) */
  PHP_FUNCTION(mb_scrub)
  {
 +	const mbfl_encoding *enc;
  	char* str;
  	size_t str_len;
 -	char *enc = NULL;
 -	size_t enc_len;
 +	char *enc_name = NULL;
 +	size_t enc_name_len;
  	char *ret;
+ 	size_t ret_len;
  
  	ZEND_PARSE_PARAMETERS_START(1, 2)
  		Z_PARAM_STRING(str, str_len)