From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 19 Jun 2019 12:38:29 +0000 (+0200)
Subject: Fix memcpy null UB in phar
X-Git-Tag: php-7.4.0alpha2~51^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bf6326259a57cda44345369d4b02ff66d1376b8;p=php

Fix memcpy null UB in phar
---

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);