[3.15] gh-153679: Raise ZipImportError for an invalid UTF-8 file name in zipimport (GH-153680) (#160617)

(cherry picked from commit 0d606d6)

Co-authored-by: tonghuaroot (童话) <tonghuaroot@gmail.com>

Author: miss-islington

Lib/test/test_zipimport.py

@@ -1150,6 +1150,24 @@ def testNotZipFile(self):
         fp.close()
         self.assertZipFailure(TESTMOD)
 
+    def testInvalidUTF8FileName(self):
+        # A UTF-8-flagged file name that is not valid UTF-8 raises ZipImportError.
+        UTF8_FLAG = 0x800
+        name = b'\xff\xfe\xff'
+        cdh = b'PK\x01\x02' + struct.pack(
+            '<HHHHHHIIIHHHHHII',
+            20, 20, UTF8_FLAG, 0, 0, 0, 0, 50, 100,
+            len(name), 0, 0, 0, 0, 0, 0)
+        cdh += name
+        eocd = b'PK\x05\x06' + struct.pack(
+            '<HHHHIIH', 0, 0, 1, 1, len(cdh), 0, 0)
+        os_helper.unlink(TESTMOD)
+        with open(TESTMOD, 'wb') as fp:
+            fp.write(cdh + eocd)
+        with self.assertRaises(zipimport.ZipImportError) as cm:
+            zipimport.zipimporter(TESTMOD)
+        self.assertIsInstance(cm.exception.__cause__, UnicodeDecodeError)
+
     # XXX: disabled until this works on Big-endian machines
     def _testBogusZipFile(self):
         os_helper.unlink(TESTMOD)

Lib/zipimport.py

@@ -428,7 +428,12 @@ def _read_directory(archive):
 
                 if flags & 0x800:
                     # UTF-8 file names extension
-                    name = name.decode()
+                    try:
+                        name = name.decode()
+                    except UnicodeDecodeError as exc:
+                        raise ZipImportError(
+                            f"can't decode file name in Zip file: {archive!r}",
+                            path=archive) from exc
                 else:
                     # Historical ZIP filename encoding
                     try:

Misc/NEWS.d/next/Library/2026-07-13-00-10-00.gh-issue-153679.RJ2WGB.rst

@@ -0,0 +1,3 @@
+:class:`zipimport.zipimporter` now raises :exc:`zipimport.ZipImportError`
+instead of :exc:`UnicodeDecodeError` for a UTF-8-flagged file name that is not
+valid UTF-8. Patch by tonghuaroot.