MFH

1 files changed, 2 insertions, 1 deletions

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 0c39daea71..17e4f7c779 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1030,15 +1030,16 @@ php_mbstr_encoding_handler(zval *arg, char *res, char *separator TSRMLS_DC)
 	strtok_buf = NULL;
 	var = php_strtok_r(res, separator, &strtok_buf);
 	while (var)  {
-		len_list[n] = php_url_decode(var, strlen(var));
 		val = strchr(var, '=');
 		val_list[n] = var;
 		n++;
 		if (val) { /* have a value */
+			php_url_decode(var, val-var);
 			*val++ = '\0';
 			val_list[n] = val;
 			len_list[n] = php_url_decode(val, strlen(val));
 		} else {
+			php_url_decode(var, strlen(var));
 			val_list[n] = "";
 			len_list[n] = 0;
 		}