summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2016-11-25 13:42:35 -0800
committerStanislav Malyshev <stas@php.net>2016-11-25 13:42:35 -0800
commitcb6bcaa61f99d62467478041b461413cc6b43563 (patch)
tree4a98c22475ea14e558bfe6d778badcaccd619bf6
parenta36dd1dfd8cf807d31aa9acc2f092b532a45bb15 (diff)
downloadphp-git-cb6bcaa61f99d62467478041b461413cc6b43563.tar.gz
Fix int/size_t confusion in isValidPharFilename (bug #73580)
-rw-r--r--ext/phar/phar_object.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index c57bdef3c6..6998a4db91 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1066,6 +1066,10 @@ PHP_METHOD(Phar, isValidPharFilename)
return;
}
+ if (ZEND_SIZE_T_INT_OVFL(fname_len)) {
+ RETURN_FALSE;
+ }
+
is_executable = executable;
RETVAL_BOOL(phar_detect_phar_fname_ext(fname, fname_len, &ext_str, &ext_len, is_executable, 2, 1) == SUCCESS);
}