Skip to content

Commit 36ff513

Browse files
bpo-41068: Fix read after write in zipfile for non-ASCII files names. (GH-21040)
1 parent c88239f commit 36ff513

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Lib/test/test_zipfile.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,6 +1600,11 @@ def test_write_unicode_filenames(self):
16001600
self.assertEqual(zf.filelist[0].filename, "foo.txt")
16011601
self.assertEqual(zf.filelist[1].filename, "\xf6.txt")
16021602

1603+
def test_read_after_write_unicode_filenames(self):
1604+
with zipfile.ZipFile(TESTFN2, 'w') as zipfp:
1605+
zipfp.writestr('приклад', b'sample')
1606+
self.assertEqual(zipfp.read('приклад'), b'sample')
1607+
16031608
def test_exclusive_create_zip_file(self):
16041609
"""Test exclusive creating a new zipfile."""
16051610
unlink(TESTFN2)

Lib/zipfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ def open(self, name, mode="r", pwd=None, *, force_zip64=False):
15341534
# strong encryption
15351535
raise NotImplementedError("strong encryption (flag bit 6)")
15361536

1537-
if zinfo.flag_bits & 0x800:
1537+
if fheader[_FH_GENERAL_PURPOSE_FLAG_BITS] & 0x800:
15381538
# UTF-8 filename
15391539
fname_str = fname.decode("utf-8")
15401540
else:
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fixed reading files with non-ASCII names from ZIP archive directly after
2+
writing them.

0 commit comments

Comments
 (0)