From c9292d08e802f121d06cc55dcfefc4b232b3c925 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Mon, 22 Jun 2020 10:25:43 +0300 Subject: [PATCH] bpo-41068: Fix read after write in zipfile for non-ASCII files names. --- Lib/test/test_zipfile.py | 5 +++++ Lib/zipfile.py | 2 +- .../next/Library/2020-06-22-10-25-39.bpo-41068._bX2BW.rst | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2020-06-22-10-25-39.bpo-41068._bX2BW.rst diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index c9ca1ddaafe191..b7bc218d17a3d9 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -1600,6 +1600,11 @@ def test_write_unicode_filenames(self): self.assertEqual(zf.filelist[0].filename, "foo.txt") self.assertEqual(zf.filelist[1].filename, "\xf6.txt") + def test_read_after_write_unicode_filenames(self): + with zipfile.ZipFile(TESTFN2, 'w') as zipfp: + zipfp.writestr('приклад', b'sample') + self.assertEqual(zipfp.read('приклад'), b'sample') + def test_exclusive_create_zip_file(self): """Test exclusive creating a new zipfile.""" unlink(TESTFN2) diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 8903d6a42ee4eb..915698f9e05889 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -1534,7 +1534,7 @@ def open(self, name, mode="r", pwd=None, *, force_zip64=False): # 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: diff --git a/Misc/NEWS.d/next/Library/2020-06-22-10-25-39.bpo-41068._bX2BW.rst b/Misc/NEWS.d/next/Library/2020-06-22-10-25-39.bpo-41068._bX2BW.rst new file mode 100644 index 00000000000000..20580c7886fac5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-06-22-10-25-39.bpo-41068._bX2BW.rst @@ -0,0 +1,2 @@ +Fixed reading files with non-ASCII names from ZIP archive directly after +writing them.