summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2018-12-01 21:48:40 -0800
committerStanislav Malyshev <stas@php.net>2018-12-01 21:48:40 -0800
commitc5869fd1c80bbb823ceca117be66b5e21214fe33 (patch)
tree2a6684a1499f0ea5c60b0ac0000b3c8bbfca09fa
parent8136d130b61bc4da6a04b41f5e1cfbaa2a402458 (diff)
parent09885f78c6c14d291ff03aaae59bf218a6b2309d (diff)
downloadphp-git-c5869fd1c80bbb823ceca117be66b5e21214fe33.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
-rw-r--r--ext/phar/phar_object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 2536d27209..88619663f1 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -3725,7 +3725,7 @@ static void phar_add_file(phar_archive_data **pphar, char *filename, int filenam
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 ;
} else {
#ifndef _WIN32