Skip to content

Commit 7bf6326

Browse files
committed
Fix memcpy null UB in phar
1 parent ae2bc62 commit 7bf6326

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ext/phar/phar_internal.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,10 @@ static inline void phar_set_inode(phar_entry_info *entry) /* {{{ */
511511

512512
tmp_len = MIN(MAXPATHLEN, entry->filename_len + entry->phar->fname_len);
513513

514-
len1 = MIN(entry->phar->fname_len, tmp_len);
515-
memcpy(tmp, entry->phar->fname, len1);
514+
if (entry->phar->fname) {
515+
len1 = MIN(entry->phar->fname_len, tmp_len);
516+
memcpy(tmp, entry->phar->fname, len1);
517+
}
516518

517519
len2 = MIN(tmp_len - len1, entry->filename_len);
518520
memcpy(tmp + len1, entry->filename, len2);

0 commit comments

Comments
 (0)