mirror of
https://github.com/php/php-src.git
synced 2025-01-24 20:53:37 +08:00
Merge branch 'PHP-7.4'
This commit is contained in:
commit
3df043324e
@ -1395,6 +1395,7 @@ int phar_create_or_parse_filename(char *fname, size_t fname_len, char *alias, si
|
||||
mydata = ecalloc(1, sizeof(phar_archive_data));
|
||||
mydata->fname = expand_filepath(fname, NULL);
|
||||
if (mydata->fname == NULL) {
|
||||
efree(mydata);
|
||||
return FAILURE;
|
||||
}
|
||||
fname_len = strlen(mydata->fname);
|
||||
|
@ -5,11 +5,11 @@ Bug #77396 Relative filename exceeding maximum path length causes null pointer d
|
||||
--FILE--
|
||||
<?php
|
||||
$path = '../' . str_repeat("x", PHP_MAXPATHLEN) . '.tar';
|
||||
$phar = new PharData($path);
|
||||
try {
|
||||
$phar = new PharData($path);
|
||||
} catch (UnexpectedValueException $e) {
|
||||
echo $e->getMessage(), "\n";
|
||||
}
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Uncaught UnexpectedValueException: Phar creation or opening failed in %s%ebug77396.php:%d
|
||||
Stack trace:
|
||||
#0 %s%ebug77396.php(%d): PharData->__construct(%s)
|
||||
#1 {main}
|
||||
thrown in %s%ebug77396.php on line %d
|
||||
--EXPECT--
|
||||
Phar creation or opening failed
|
||||
|
Loading…
Reference in New Issue
Block a user