Fixed array var handling. Patch by Moriyoshi Koizumi <readjust@deneb.freemail.ne.jp>

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 0749450ac28853d818503648079b01e7846002d9..f7660db66d471902cdaee4ffc4c00b292263f728 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1271,15 +1271,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;
                }