summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2018-12-01 21:48:35 -0800
committerStanislav Malyshev <stas@php.net>2018-12-01 21:48:35 -0800
commit09885f78c6c14d291ff03aaae59bf218a6b2309d (patch)
tree76392723410c9bbb93ff8159b932b66fffffd195
parent1aec05defdb43d474a3a52bffa3f77646a04fcdc (diff)
parentcea277048d039c7b2a9253c44309a5b3dc7a99c4 (diff)
downloadphp-git-09885f78c6c14d291ff03aaae59bf218a6b2309d.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
-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 bd7cbc9174..6bd5c1dc33 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -3678,7 +3678,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