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

Fix persistent local flag on filename zend_strings in phar (#17353)

Browse Source 
This fixes the nightly failure.
This commit is contained in:
Niels Dossche
2025-01-04 14:56:26 +01:00
committed by GitHub
parent 5ba2143c1c
commit 9e3508bfa8
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/phar/phar.c
View File

@@ -1182,6 +1182,9 @@ static zend_result phar_parse_pharfile(php_stream *fp, char *fname, size_t fname
}
entry.filename = zend_string_init(filename_raw, filename_len, entry.is_persistent);
if (entry.is_persistent) {
GC_MAKE_PERSISTENT_LOCAL(entry.filename);
}
PHAR_GET_32(buffer, len);
if (len > (size_t)(endbuffer - buffer)) {

9
ext/phar/tar.c
View File

@@ -374,6 +374,9 @@ bail:
return FAILURE;
}
entry.filename = zend_string_alloc(entry.uncompressed_filesize, myphar->is_persistent);
if (myphar->is_persistent) {
GC_MAKE_PERSISTENT_LOCAL(entry.filename);
}
ZSTR_VAL(entry.filename)[entry.uncompressed_filesize] = '\0';
read = php_stream_read(fp, ZSTR_VAL(entry.filename), entry.uncompressed_filesize);
@@ -440,6 +443,9 @@ bail:
}
entry.filename = zend_string_init(name, filename_len, myphar->is_persistent);
if (myphar->is_persistent) {
GC_MAKE_PERSISTENT_LOCAL(entry.filename);
}
} else if (!last_was_longlink) {
/* calculate strlen, which can be no longer than 100 */
uint32_t filename_len;
@@ -455,6 +461,9 @@ bail:
}
entry.filename = zend_string_init(hdr->name, filename_len, myphar->is_persistent);
if (myphar->is_persistent) {
GC_MAKE_PERSISTENT_LOCAL(entry.filename);
}
}
last_was_longlink = 0;