summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorLevi Morrison <levim@php.net>2018-08-11 16:54:21 -0600
committerLevi Morrison <levim@php.net>2018-08-11 16:54:21 -0600
commit29b56a878aa22310d645c3266110417e07ebe683 (patch)
treebe62eda2f6bacde9f94ce8c04cb3e919b56f902e /ext
parentb151e17bdfca573e0205cc90dc710f89d77f03cf (diff)
downloadphp-git-29b56a878aa22310d645c3266110417e07ebe683.tar.gz
Quell GCC warning on mixing || and &&
Diffstat (limited to 'ext')
-rw-r--r--ext/phar/phar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index fd716b6038..b3be34d84e 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1861,7 +1861,7 @@ static int phar_check_str(const char *fname, const char *ext_str, size_t ext_len
pos = strstr(ext_str, ".phar");
if (!pos
- || pos != ext_str && (*(pos - 1) == '/')
+ || (pos != ext_str && (*(pos - 1) == '/'))
|| (ext_len - (pos - ext_str)) < 5
|| !(pos += 5)
|| !(*pos == '\0' || *pos == '/' || *pos == '.')) {