Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
This commit is contained in:
Stanislav Malyshev 2018-12-01 21:48:44 -08:00
commit e614b12712

View File

@ -3655,7 +3655,7 @@ static void phar_add_file(phar_archive_data **pphar, char *filename, size_t file
data->internal_file->compressed_filesize = data->internal_file->uncompressed_filesize = contents_len; data->internal_file->compressed_filesize = data->internal_file->uncompressed_filesize = contents_len;
} }
if (contents_file != NULL && php_stream_stat(contents_file, &ssb TSRMLS_CC) != -1) { if (contents_file != NULL && php_stream_stat(contents_file, &ssb) != -1) {
data->internal_file->flags = ssb.sb.st_mode & PHAR_ENT_PERM_MASK ; data->internal_file->flags = ssb.sb.st_mode & PHAR_ENT_PERM_MASK ;
} else { } else {
#ifndef _WIN32 #ifndef _WIN32