php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  ext/phar: use size_t type instead of int
This commit is contained in:
Gina Peter Banyard
2025-10-15 13:37:00 +01:00
parent c31c697a85 2c514202e1
commit 2bdc7459cf
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -23,6 +23,10 @@ PHP NEWS
. Fixed bug GH-19994 (openssl_get_cipher_methods inconsistent with fetching).
(Jakub Zelenka)
- Phar:
. Fix potential buffer length truncation due to usage of type int instead
of type size_t. (Girgias)
- SPL:
. Fixed bug GH-20101 (SplHeap/SplPriorityQueue serialization
exposes INDIRECTs). (nielsdos)

2
ext/phar/phar.c
View File

@@ -1600,7 +1600,7 @@ zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias,
}
/* }}}*/
static inline char *phar_strnstr(const char *buf, int buf_len, const char *search, int search_len) /* {{{ */
static inline char *phar_strnstr(const char *buf, size_t buf_len, const char *search, size_t search_len) /* {{{ */
{
const char *c;
ptrdiff_t so_far = 0;

2
ext/phar/stream.c
View File

@@ -665,7 +665,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
{
php_url *resource;
char *internal_file, *error;
int internal_file_len;
size_t internal_file_len;
phar_entry_data *idata;
phar_archive_data *pphar;