python
diff --git a/‎Lib/test/test_import/__init__.py‎
Lines changed: 8 additions & 0 deletions b/‎Lib/test/test_import/__init__.py‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎Misc/NEWS.d/next/Core and Builtins/2023-06-22-19-16-24.gh-issue-105979.TDP2CU.rst‎
Lines changed: 1 addition & 0 deletions b/‎Misc/NEWS.d/next/Core and Builtins/2023-06-22-19-16-24.gh-issue-105979.TDP2CU.rst‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Python/import.c‎
Lines changed: 1 addition & 0 deletions b/‎Python/import.c‎
Lines changed: 1 addition & 0 deletions
@@ -23,6 +23,7 @@
 import unittest
 from unittest import mock
 import _testinternalcapi
+import _imp
 
 from test.support import os_helper
 from test.support import (
@@ -763,6 +764,13 @@ def test_dll_dependency_import(self):
                                     env=env,
                                     cwd=os.path.dirname(pyexe))
 
+    def test_issue105979(self):
+        # this used to crash
+        with self.assertRaises(ImportError) as cm:
+            _imp.get_frozen_object("x", b"6\'\xd5Cu\x12")
+        self.assertIn("Frozen object named 'x' is invalid",
+                      str(cm.exception))
+
 
 @skip_if_dont_write_bytecode
 class FilePermissionTests(unittest.TestCase):
 
@@ -0,0 +1 @@
+Fix crash in :func:`!_imp.get_frozen_object` due to improper exception handling.
@@ -2053,6 +2053,7 @@ unmarshal_frozen_code(PyInterpreterState *interp, struct frozen_info *info)
     PyObject *co = PyMarshal_ReadObjectFromString(info->data, info->size);
     if (co == NULL) {
         /* Does not contain executable code. */
+        PyErr_Clear();
         set_frozen_error(FROZEN_INVALID, info->nameobj);
         return NULL;
     }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix crash in :func:`!_imp.get_frozen_object` due to improper exception handling.
Original file line number	Diff line number	Diff line change
`@@ -2053,6 +2053,7 @@ unmarshal_frozen_code(PyInterpreterState interp, struct frozen_info info)`
`2053`	`2053`	`PyObject *co = PyMarshal_ReadObjectFromString(info->data, info->size);`
`2054`	`2054`	`if (co == NULL) {`
`2055`	`2055`	`/* Does not contain executable code. */`
	`2056`	`+ PyErr_Clear();`
`2056`	`2057`	`set_frozen_error(FROZEN_INVALID, info->nameobj);`
`2057`	`2058`	`return NULL;`
`2058`	`2059`	`}`