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