From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 14 Jan 2019 09:24:11 +0000 (+0100)
Subject: Merge branch 'PHP-7.3'
X-Git-Tag: php-7.4.0alpha1~1230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93a221ec4bc7bb809c5e72689940d12d03f4a613;p=php

Merge branch 'PHP-7.3'
---

93a221ec4bc7bb809c5e72689940d12d03f4a613
diff --cc ext/mbstring/mbstring.c
index 264c6020ca,0e255e98d2..17df6036dc
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -4967,8 -5022,10 +4965,9 @@@ PHP_FUNCTION(mb_scrub
  	const mbfl_encoding *enc;
  	char* str;
  	size_t str_len;
 -	char *enc_name = NULL;
 -	size_t enc_name_len;
 +	zend_string *enc_name = NULL;
  	char *ret;
+ 	size_t ret_len;
  
  	ZEND_PARSE_PARAMETERS_START(1, 2)
  		Z_PARAM_STRING(str, str_len)