Skip to content

Commit 6df26b9

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: ext/phar: use size_t type instead of int
2 parents 6da93a8 + 2bdc745 commit 6df26b9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/phar/phar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@ zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias,
15961596
}
15971597
/* }}}*/
15981598

1599-
static inline char *phar_strnstr(const char *buf, int buf_len, const char *search, int search_len) /* {{{ */
1599+
static inline char *phar_strnstr(const char *buf, size_t buf_len, const char *search, size_t search_len) /* {{{ */
16001600
{
16011601
const char *c;
16021602
ptrdiff_t so_far = 0;

ext/phar/stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
665665
{
666666
php_url *resource;
667667
char *internal_file, *error;
668-
int internal_file_len;
668+
size_t internal_file_len;
669669
phar_entry_data *idata;
670670
phar_archive_data *pphar;
671671

0 commit comments

Comments
 (0)