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.3' into PHP-8.4

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

2
NEWS
View File

@@ -39,6 +39,8 @@ PHP NEWS
. Fix file descriptor/memory leak when opening central fp fails. (nielsdos)
. Fix memleak+UAF when opening temp stream in buildFromDirectory() fails.
(nielsdos)
. Fix potential buffer length truncation due to usage of type int instead
of type size_t. (Girgias)
- Random:
. Fix Randomizer::__serialize() w.r.t. INDIRECTs. (nielsdos)

2
ext/phar/phar.c
View File

@@ -1592,7 +1592,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

@@ -670,7 +670,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;