diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-25 13:43:59 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-25 13:43:59 -0800 |
| commit | 2cc3df32520c14f4721f80d9f90cb8dd5c6d2cdb (patch) | |
| tree | 394e3d1fd5c21e50fb49b94c16b4cb5018d11aae | |
| parent | c26e96a05d3fcdb13a7bbe8551155ca2f820e3a3 (diff) | |
| parent | cb6bcaa61f99d62467478041b461413cc6b43563 (diff) | |
| download | php-git-2cc3df32520c14f4721f80d9f90cb8dd5c6d2cdb.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix int/size_t confusion in isValidPharFilename (bug #73580)
| -rw-r--r-- | ext/phar/phar_object.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index f3e98a6d96..28ec8a3411 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -1062,6 +1062,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); } |