57c57
< 	char *namebuf=NULL, *filenamebuf=NULL, *lbuf=NULL;
---
> 	char *namebuf=NULL, *filenamebuf=NULL, *lbuf=NULL, *abuf=NULL;
107c107
< 					lbuf = emalloc(s-name + MAX(MAX(sizeof("_name"),sizeof("_size")),sizeof("_type")));
---
> 					lbuf = emalloc(s-name + MAX(MAX(sizeof("_name"),sizeof("_size")),sizeof("_type")) + 4);
128c128,134
< 					sprintf(lbuf, "%s_name", namebuf);
---
> 					if (strstr(namebuf, "[]")) {
> 						abuf = estrndup(namebuf, strlen(namebuf) - 2);
> 						sprintf(lbuf, "%s_name[]", abuf);
> 						efree(abuf);
> 					} else {
> 						sprintf(lbuf, "%s_name", namebuf);
> 					}
131c137,138
< 						SET_VAR_STRING(lbuf, estrdup(s + 1));
---
> 						/* SET_VAR_STRING(lbuf, estrdup(s + 1)); */
> 						_php3_parse_gpc_data(estrdup(s + 1), lbuf, http_post_vars);
133c140,141
< 						SET_VAR_STRING(lbuf, estrdup(filenamebuf));
---
> 						/* SET_VAR_STRING(lbuf, estrdup(filenamebuf)); */
> 						_php3_parse_gpc_data(estrdup(filenamebuf), lbuf, http_post_vars);
211c219,220
< 					SET_VAR_STRING(namebuf, estrdup("none"));
---
> 					/* SET_VAR_STRING(namebuf, estrdup("none")); */
> 					_php3_parse_gpc_data(estrdup("none"), namebuf, http_post_vars);
215c224,225
< 					SET_VAR_STRING(namebuf, estrdup("none"));
---
> 					/* SET_VAR_STRING(namebuf, estrdup("none")); */
> 					_php3_parse_gpc_data(estrdup("none"), namebuf, http_post_vars);
218c228,229
< 					SET_VAR_STRING(namebuf, estrdup("none"));
---
> 					/* SET_VAR_STRING(namebuf, estrdup("none")); */
> 					_php3_parse_gpc_data(estrdup("none"), namebuf, http_post_vars);
231c242,243
< 					SET_VAR_STRING(namebuf, estrdup(fn));
---
> 					/* SET_VAR_STRING(namebuf, estrdup(fn)); */
> 					_php3_parse_gpc_data(estrdup(fn), namebuf, http_post_vars);