MFH. This should fix all var initilization problems finally.

1 files changed, 8 insertions, 4 deletions

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