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

Fix leak in phar open

Browse source
This commit is contained in:
Nikita Popov 2019-10-10 16:14:04 +02:00
parent 96c84b7bc1
commit 46561dab6a
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/phar/phar.c
View file

@ -1386,6 +1386,7 @@ int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int a
mydata = ecalloc(1, sizeof(phar_archive_data)); mydata = ecalloc(1, sizeof(phar_archive_data));
mydata->fname = expand_filepath(fname, NULL); mydata->fname = expand_filepath(fname, NULL);
if (mydata->fname == NULL) { if (mydata->fname == NULL) {
efree(mydata);
return FAILURE; return FAILURE;
} }
fname_len = strlen(mydata->fname); fname_len = strlen(mydata->fname);

14
ext/phar/tests/bug77396.phpt
View file

@ -5,11 +5,11 @@ Bug #77396 Relative filename exceeding maximum path length causes null pointer d
--FILE-- --FILE--
<?php <?php
$path = '../' . str_repeat("x", PHP_MAXPATHLEN) . '.tar'; $path = '../' . str_repeat("x", PHP_MAXPATHLEN) . '.tar';
$phar = new PharData($path); try {
$phar = new PharData($path);
} catch (UnexpectedValueException $e) {
echo $e->getMessage(), "\n";
}
?> ?>
--EXPECTF-- --EXPECT--
Fatal error: Uncaught UnexpectedValueException: Phar creation or opening failed in %s%ebug77396.php:%d Phar creation or opening failed
Stack trace:
#0 %s%ebug77396.php(%d): PharData->__construct(%s)
#1 {main}
thrown in %s%ebug77396.php on line %d