diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-19 14:38:29 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-19 15:09:00 +0200 |
| commit | 7bf6326259a57cda44345369d4b02ff66d1376b8 (patch) | |
| tree | 8acb080b693dcfa983da50af63c11bc6d952979c /ext/phar | |
| parent | ae2bc6297ebc4e5992949a4e0fbeaa0f03c62704 (diff) | |
| download | php-git-7bf6326259a57cda44345369d4b02ff66d1376b8.tar.gz | |
Fix memcpy null UB in phar
Diffstat (limited to 'ext/phar')
| -rw-r--r-- | ext/phar/phar_internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index cd298e6bbf..0ab7fb9156 100644 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -511,8 +511,10 @@ static inline void phar_set_inode(phar_entry_info *entry) /* {{{ */ tmp_len = MIN(MAXPATHLEN, entry->filename_len + entry->phar->fname_len); - len1 = MIN(entry->phar->fname_len, tmp_len); - memcpy(tmp, entry->phar->fname, len1); + if (entry->phar->fname) { + len1 = MIN(entry->phar->fname_len, tmp_len); + memcpy(tmp, entry->phar->fname, len1); + } len2 = MIN(tmp_len - len1, entry->filename_len); memcpy(tmp + len1, entry->filename, len2); |