mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Fix #77432: Segmentation fault on including phar file
phar_get_pharfp() can return NULL. In this case this is because the stream gets closed by the include code in the engine. However, the phar entry is still cached, so when the next include happens the engine tries to read from a closed (and nullified) stream. Use the same fix as in phar_open_entry_fp(): take into account that the phar_get_pharfp() can return NULL and in that case reopen the phar archive. Closes GH-13056.
This commit is contained in:
parent
77ac1e8592
commit
1edcfccdca
3 changed files with 61 additions and 1 deletions
3
NEWS
3
NEWS
|
@ -51,6 +51,9 @@ PHP NEWS
|
||||||
. Fixed bug GH-12974 (Apache crashes on shutdown when using pg_pconnect()).
|
. Fixed bug GH-12974 (Apache crashes on shutdown when using pg_pconnect()).
|
||||||
(nielsdos)
|
(nielsdos)
|
||||||
|
|
||||||
|
- Phar:
|
||||||
|
. Fixed bug #77432 (Segmentation fault on including phar file). (nielsdos)
|
||||||
|
|
||||||
- PHPDBG:
|
- PHPDBG:
|
||||||
. Fixed bug GH-12962 (Double free of init_file in phpdbg_prompt.c). (nielsdos)
|
. Fixed bug GH-12962 (Double free of init_file in phpdbg_prompt.c). (nielsdos)
|
||||||
|
|
||||||
|
|
|
@ -254,6 +254,17 @@ static php_stream * phar_wrapper_open_url(php_stream_wrapper *wrapper, const cha
|
||||||
php_url_free(resource);
|
php_url_free(resource);
|
||||||
goto phar_stub;
|
goto phar_stub;
|
||||||
} else {
|
} else {
|
||||||
|
php_stream *stream = phar_get_pharfp(phar);
|
||||||
|
if (stream == NULL) {
|
||||||
|
if (UNEXPECTED(FAILURE == phar_open_archive_fp(phar))) {
|
||||||
|
php_stream_wrapper_log_error(wrapper, options, "phar error: could not reopen phar \"%s\"", ZSTR_VAL(resource->host));
|
||||||
|
efree(internal_file);
|
||||||
|
php_url_free(resource);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
stream = phar_get_pharfp(phar);
|
||||||
|
}
|
||||||
|
|
||||||
phar_entry_info *entry;
|
phar_entry_info *entry;
|
||||||
|
|
||||||
entry = (phar_entry_info *) ecalloc(1, sizeof(phar_entry_info));
|
entry = (phar_entry_info *) ecalloc(1, sizeof(phar_entry_info));
|
||||||
|
@ -266,7 +277,7 @@ static php_stream * phar_wrapper_open_url(php_stream_wrapper *wrapper, const cha
|
||||||
entry->is_crc_checked = 1;
|
entry->is_crc_checked = 1;
|
||||||
|
|
||||||
idata = (phar_entry_data *) ecalloc(1, sizeof(phar_entry_data));
|
idata = (phar_entry_data *) ecalloc(1, sizeof(phar_entry_data));
|
||||||
idata->fp = phar_get_pharfp(phar);
|
idata->fp = stream;
|
||||||
idata->phar = phar;
|
idata->phar = phar;
|
||||||
idata->internal_file = entry;
|
idata->internal_file = entry;
|
||||||
if (!phar->is_persistent) {
|
if (!phar->is_persistent) {
|
||||||
|
|
46
ext/phar/tests/bug77432.phpt
Normal file
46
ext/phar/tests/bug77432.phpt
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
--TEST--
|
||||||
|
Bug #77432 (Segmentation fault on including phar file)
|
||||||
|
--EXTENSIONS--
|
||||||
|
phar
|
||||||
|
--INI--
|
||||||
|
phar.readonly=0
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
|
||||||
|
$filename = __DIR__ . '/bug77432.phar';
|
||||||
|
|
||||||
|
$phar = new Phar($filename);
|
||||||
|
$phar->startBuffering();
|
||||||
|
$phar->addFromString('test.txt', 'text');
|
||||||
|
$phar->setStub('<?php echo "hello world\n"; __HALT_COMPILER(); ?>');
|
||||||
|
$phar->stopBuffering();
|
||||||
|
unset($phar);
|
||||||
|
|
||||||
|
echo "--- Include 1 ---\n";
|
||||||
|
include("phar://" . $filename);
|
||||||
|
echo "--- Include 2 ---\n";
|
||||||
|
// Note: will warn because the halting offset is redefined, but won't display the name because "zend_mangle_property_name" starts the name with \0
|
||||||
|
// However, this is just the easiest way to reproduce it, so go with this test.
|
||||||
|
include("phar://" . $filename);
|
||||||
|
echo "--- After unlink ---\n";
|
||||||
|
unlink($filename);
|
||||||
|
// This will just fail, as it should, but it is here to test the reopen error-handling path.
|
||||||
|
include("phar://" . $filename);
|
||||||
|
|
||||||
|
?>
|
||||||
|
--CLEAN--
|
||||||
|
<?php
|
||||||
|
@unlink(__DIR__ . '/bug77432.phar');
|
||||||
|
?>
|
||||||
|
--EXPECTF--
|
||||||
|
--- Include 1 ---
|
||||||
|
hello world
|
||||||
|
--- Include 2 ---
|
||||||
|
|
||||||
|
Warning: Constant already defined in %s on line %d
|
||||||
|
hello world
|
||||||
|
--- After unlink ---
|
||||||
|
|
||||||
|
Warning: include(%sbug77432.phar): Failed to open stream: phar error: could not reopen phar "%sbug77432.phar" in %s on line %d
|
||||||
|
|
||||||
|
Warning: include(): Failed opening '%sbug77432.phar' for inclusion (include_path='.:') in %s on line %d
|
Loading…
Add table
Add a link
Reference in a new issue