cvs: php4 /main rfc1867.c

kalowsky Fri Aug 16 15:34:43 2002 EDT Modified files: /php4/main rfc1867.c Log: Fix for bug #18792 submitted by t.bubeck@reinform.de # talked this over with sterling and he believes it shouldn't break anything # although there might be a need/desire to check for both ',' and ';' Index: php4/main/rfc1867.c diff -u php4/main/rfc1867.c:1.113 php4/main/rfc1867.c:1.114 --- php4/main/rfc1867.c:1.113 Thu Aug 8 08:40:51 2002 +++ php4/main/rfc1867.c Fri Aug 16 15:34:43 2002 @@ -16,7 +16,7 @@ | Jani Taskinen <sniper@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.113 2002/08/08 12:40:51 sesser Exp $ */ +/* $Id: rfc1867.c,v 1.114 2002/08/16 19:34:43 kalowsky Exp $ */ /* * This product includes software developed by the Apache Group @@ -617,7 +617,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) { - char *boundary, *s=NULL, *start_arr=NULL, *array_index=NULL; + char *boundary, *s=NULL, *boundary_end = NULL, *start_arr=NULL, *array_index=NULL; char *temp_filename=NULL, *lbuf=NULL, *abuf=NULL; int boundary_len=0, total_bytes=0, cancel_upload=0, is_arr_upload=0, array_len=0, max_file_size=0; zval *http_post_files=NULL; @@ -638,6 +638,11 @@ sapi_module.sapi_error(E_WARNING, "Missing boundary in multipart/form-data POST data"); return; } + + /* search for the end of the boundary */ + boundary_end = strchr(boundary, ','); + if (boundary_end ) *boundary_end = 0; + boundary++; boundary_len = strlen(boundary);