archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fix GH-17808: PharFileInfo refcount bug
This commit is contained in:
Niels Dossche 2025-02-15 13:16:33 +01:00
commit 5d8ea65f43
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
3 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -49,6 +49,9 @@ PHP NEWS
. Fixed bug GH-17747 (Exception on reading property in register-based . Fixed bug GH-17747 (Exception on reading property in register-based
FETCH_OBJ_R breaks JIT). (Dmitry, nielsdos) FETCH_OBJ_R breaks JIT). (Dmitry, nielsdos)
- Phar:
. Fixed bug GH-17808: PharFileInfo refcount bug. (nielsdos)
- PHPDBG: - PHPDBG:
. Partially fixed bug GH-17387 (Trivial crash in phpdbg lexer). (nielsdos) . Partially fixed bug GH-17387 (Trivial crash in phpdbg lexer). (nielsdos)
. Fix memory leak in phpdbg calling registered function. (nielsdos) . Fix memory leak in phpdbg calling registered function. (nielsdos)

15
ext/phar/phar_object.c
View file

@ -4510,6 +4510,9 @@ PHP_METHOD(PharFileInfo, __construct)
efree(entry); efree(entry);
entry_obj->entry = entry_info; entry_obj->entry = entry_info;
if (!entry_info->is_persistent && !entry_info->is_temp_dir) {
++entry_info->fp_refcount;
}
ZVAL_STRINGL(&arg1, fname, fname_len); ZVAL_STRINGL(&arg1, fname, fname_len);
@ -4539,15 +4542,23 @@ PHP_METHOD(PharFileInfo, __destruct)
RETURN_THROWS(); RETURN_THROWS();
} }
if (entry_obj->entry && entry_obj->entry->is_temp_dir) { if (!entry_obj->entry) {
return;
}
if (entry_obj->entry->is_temp_dir) {
if (entry_obj->entry->filename) { if (entry_obj->entry->filename) {
efree(entry_obj->entry->filename); efree(entry_obj->entry->filename);
entry_obj->entry->filename = NULL; entry_obj->entry->filename = NULL;
} }
efree(entry_obj->entry); efree(entry_obj->entry);
entry_obj->entry = NULL; } else if (!entry_obj->entry->is_persistent) {
--entry_obj->entry->fp_refcount;
/* It is necessarily still in the manifest, which will ultimately free this. */
} }
entry_obj->entry = NULL;
} }
/* }}} */ /* }}} */

21
ext/phar/tests/gh17808.phpt Normal file
View file

@ -0,0 +1,21 @@
--TEST--
GH-17808 (PharFileInfo refcount bug)
--EXTENSIONS--
phar
--FILE--
<?php
$fname = __DIR__.'/tar/files/Structures_Graph-1.0.3.tgz';
$tar = new PharData($fname);
foreach (new RecursiveIteratorIterator($tar) as $file) {
}
var_dump("$file");
var_dump(strlen($file->getContent()));
unlink("$file");
var_dump($file->getATime());
?>
--EXPECTF--
string(%d) "phar://%spackage.xml"
int(6747)
Warning: unlink(): phar error: "package.xml" in phar %s, has open file pointers, cannot unlink in %s on line %d
int(33188)