commit c916c48afc02c26a50843c7b381a2b567bb72e46
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Jun 22 01:46:11 2020 -0700
committer GitHub <noreply@github.com> Mon Jun 22 01:46:11 2020 -0700
tree c56e8f0b232497de752049909db3768b0de84aaa
parent 5606d555b6e797625be9b0368472a86d8ad5252e

bpo-41068: Fix read after write in zipfile for non-ASCII files names. (GH-21040)

(cherry picked from commit 36ff513f82e372ed3cea0bf7cbdf15a1ef6dab9e)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Lib/zipfile.py

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 8903d6a..915698f 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1534,7 +1534,7 @@
                 # strong encryption
                 raise NotImplementedError("strong encryption (flag bit 6)")
 
-            if zinfo.flag_bits & 0x800:
+            if fheader[_FH_GENERAL_PURPOSE_FLAG_BITS] & 0x800:
                 # UTF-8 filename
                 fname_str = fname.decode("utf-8")
             else: