From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 19 Jun 2019 13:34:51 +0000 (+0200)
Subject: Fix uninitialized variable
X-Git-Tag: php-7.4.0alpha2~51^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c10cb47b5f0a4d58d37b1974c993f5a3c09b1997;p=php

Fix uninitialized variable

I mistakenly moved len1 initialization into the conditional as well.
---

diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index 0ab7fb9156..10be6d4d95 100644
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -511,8 +511,8 @@ 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);
 	if (entry->phar->fname) {
-		len1 = MIN(entry->phar->fname_len, tmp_len);
 		memcpy(tmp, entry->phar->fname, len1);
 	}