X Tutup
Skip to content

gh-105979: Fix exception handling in unmarshal_frozen_code (Python/import.c) #105980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kumaraditya303 merged 5 commits into from
Jun 22, 2023
Merged

gh-105979: Fix exception handling in unmarshal_frozen_code (Python/import.c) #105980

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5952605
Fix exception handling in unmarshal_frozen_code (Python/import.c)
chgnrdv Jun 21, 2023
472a6ca
added test
chgnrdv Jun 22, 2023
41f3da7
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 22, 2023
3502030
Update Misc/NEWS.d/next/Core and Builtins/2023-06-22-19-16-24.gh-issu…
kumaraditya303 Jun 22, 2023
abd4dfc
Merge branch 'main' into _imp.get_frozen_object-clear-exc-if-unmarsha…
kumaraditya303 Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Lib/test/test_import/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import unittest
from unittest import mock
import _testinternalcapi
import _imp

from test.support import os_helper
from test.support import (
Expand Down Expand Up @@ -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):
Expand Down
1 change: 1 addition & 0 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,6 +2071,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;
}
Expand Down
X Tutup