Additional fix for #20087

# Thanks, Derick!

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 00dd6e01e48c177f0fe19f35f7507d22e6245ab4..8bd3d141199c06e56c70d532df65fe0c3da44088 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1400,7 +1400,6 @@ php_mbstr_encoding_handler(zval *arg, char *res, char *separator TSRMLS_DC)
                        val_list[n] = var;
                        n++;
                        
-                       php_url_decode(var, strlen(var));
                        val_list[n] = "";
                        len_list[n] = 0;
                }
@@ -1704,17 +1703,19 @@ PHP_FUNCTION(mb_parse_str)
        while (var && n < num) {
                val = strchr(var, '=');
                if (val) { /* have a value */
-                       *val++ = '\0';
                        str_list[n] = var;
                        len_list[n] = php_url_decode(var, strlen(var));
                        n++;
+
+                       *val++ = '\0';
                        str_list[n] = val;
                        len_list[n] = php_url_decode(val, strlen(val));
                } else {
                        str_list[n] = var;
                        len_list[n] = php_url_decode(var, strlen(var));
                        n++;
-                       str_list[n] = NULL;
+
+                       str_list[n] = "";
                        len_list[n] = 0;
                }
                n++;