]> granicus.if.org Git - php/commitdiff
Fix uninitialized variable
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 19 Jun 2019 13:34:51 +0000 (15:34 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 19 Jun 2019 13:34:51 +0000 (15:34 +0200)
I mistakenly moved len1 initialization into the conditional as well.

ext/phar/phar_internal.h

index 0ab7fb9156e5c38453ba46e3bc321c798722e1d0..10be6d4d9538f50f33f25768006c3860d0c5286c 100644 (file)
@@ -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);
        }