diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-12-15 11:45:35 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-12-15 11:46:28 +0100 |
| commit | c2fbab392c5b25aeb2daf243f4107557416942fb (patch) | |
| tree | af46f68a36ea048f930f79ba0c3983a0df179834 /ext/phar/util.c | |
| parent | 305500a3b1777c5c5441f18746d6fe9124646c35 (diff) | |
| parent | a53d67ceac301cbd27c4f0f716d4fbcdb7db3407 (diff) | |
| download | php-git-c2fbab392c5b25aeb2daf243f4107557416942fb.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #77322: PharData::addEmptyDir('/') Possible integer overflow
Diffstat (limited to 'ext/phar/util.c')
| -rw-r--r-- | ext/phar/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index 6c084d8458..b45251d14a 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -567,7 +567,7 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, ch } else { etemp.flags = etemp.old_flags = PHAR_ENT_PERM_DEF_FILE; } - if (is_dir) { + if (is_dir && path_len) { etemp.filename_len--; /* strip trailing / */ path_len--; } |