@@ -614,7 +614,7 @@ static void *php_ap_memstr(char *haystack, int haystacklen, char *needle, int ne
614
614
}
615
615
616
616
/* read until a boundary condition */
617
- static int multipart_buffer_read (multipart_buffer * self , char * buf , size_t bytes , int * end )
617
+ static size_t multipart_buffer_read (multipart_buffer * self , char * buf , size_t bytes , int * end )
618
618
{
619
619
size_t len , max ;
620
620
char * bound ;
@@ -653,7 +653,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes
653
653
self -> buf_begin += len ;
654
654
}
655
655
656
- return ( int ) len ;
656
+ return len ;
657
657
}
658
658
659
659
/*
@@ -663,7 +663,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes
663
663
static char * multipart_buffer_read_body (multipart_buffer * self , size_t * len )
664
664
{
665
665
char buf [FILLUNIT ], * out = NULL ;
666
- int total_bytes = 0 , read_bytes = 0 ;
666
+ size_t total_bytes = 0 , read_bytes = 0 ;
667
667
668
668
while ((read_bytes = multipart_buffer_read (self , buf , sizeof (buf ), NULL ))) {
669
669
out = erealloc (out , total_bytes + read_bytes + 1 );
@@ -690,7 +690,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
690
690
char * boundary , * s = NULL , * boundary_end = NULL , * start_arr = NULL , * array_index = NULL ;
691
691
char * lbuf = NULL , * abuf = NULL ;
692
692
zend_string * temp_filename = NULL ;
693
- int boundary_len = 0 , cancel_upload = 0 , is_arr_upload = 0 , array_len = 0 ;
693
+ int boundary_len = 0 , cancel_upload = 0 , is_arr_upload = 0 ;
694
+ size_t array_len = 0 ;
694
695
int64_t total_bytes = 0 , max_file_size = 0 ;
695
696
int skip_upload = 0 , anonindex = 0 , is_anonymous ;
696
697
HashTable * uploaded_files = NULL ;
@@ -1124,7 +1125,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
1124
1125
is_arr_upload = (start_arr = strchr (param ,'[' )) && (param [strlen (param )- 1 ] == ']' );
1125
1126
1126
1127
if (is_arr_upload ) {
1127
- array_len = ( int ) strlen (start_arr );
1128
+ array_len = strlen (start_arr );
1128
1129
if (array_index ) {
1129
1130
efree (array_index );
1130
1131
}
0 commit comments