@@ -606,7 +606,7 @@ static void *php_ap_memstr(char *haystack, int haystacklen, char *needle, int ne
606
606
}
607
607
608
608
/* read until a boundary condition */
609
- static int multipart_buffer_read (multipart_buffer * self , char * buf , size_t bytes , int * end )
609
+ static size_t multipart_buffer_read (multipart_buffer * self , char * buf , size_t bytes , int * end )
610
610
{
611
611
size_t len , max ;
612
612
char * bound ;
@@ -645,7 +645,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes
645
645
self -> buf_begin += len ;
646
646
}
647
647
648
- return ( int ) len ;
648
+ return len ;
649
649
}
650
650
651
651
/*
@@ -655,7 +655,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes
655
655
static char * multipart_buffer_read_body (multipart_buffer * self , size_t * len )
656
656
{
657
657
char buf [FILLUNIT ], * out = NULL ;
658
- int total_bytes = 0 , read_bytes = 0 ;
658
+ size_t total_bytes = 0 , read_bytes = 0 ;
659
659
660
660
while ((read_bytes = multipart_buffer_read (self , buf , sizeof (buf ), NULL ))) {
661
661
out = erealloc (out , total_bytes + read_bytes + 1 );
@@ -682,7 +682,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
682
682
char * boundary , * s = NULL , * boundary_end = NULL , * start_arr = NULL , * array_index = NULL ;
683
683
char * lbuf = NULL , * abuf = NULL ;
684
684
zend_string * temp_filename = NULL ;
685
- int boundary_len = 0 , cancel_upload = 0 , is_arr_upload = 0 , array_len = 0 ;
685
+ int boundary_len = 0 , cancel_upload = 0 , is_arr_upload = 0 ;
686
+ size_t array_len = 0 ;
686
687
int64_t total_bytes = 0 , max_file_size = 0 ;
687
688
int skip_upload = 0 , anonindex = 0 , is_anonymous ;
688
689
HashTable * uploaded_files = NULL ;
@@ -1116,7 +1117,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
1116
1117
is_arr_upload = (start_arr = strchr (param ,'[' )) && (param [strlen (param )- 1 ] == ']' );
1117
1118
1118
1119
if (is_arr_upload ) {
1119
- array_len = ( int ) strlen (start_arr );
1120
+ array_len = strlen (start_arr );
1120
1121
if (array_index ) {
1121
1122
efree (array_index );
1122
1123
}
0 commit comments