Skip to content

gh-98354: Add unicode check for 'name' attribute in _imp_create_builtin #98412

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
miss-islington merged 7 commits into from
Oct 20, 2022
Merged

gh-98354: Add unicode check for 'name' attribute in _imp_create_builtin #98412

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
866bf67
Add unicode check for 'name' attribute in _imp_create_builtin
chgnrdv Oct 18, 2022
cf9fa50
Merge branch 'main' into _imp_create_builtin-check-name-for-unicode
chgnrdv Oct 18, 2022
4d0d69b
Added missing Py_DECREF
chgnrdv Oct 18, 2022
ea78278
Merge branch '_imp_create_builtin-check-name-for-unicode' of https://…
chgnrdv Oct 18, 2022
48b46a4
Added tests
chgnrdv Oct 19, 2022
010add5
Fixed tests because sys module import breaks them
chgnrdv Oct 19, 2022
964da44
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 19, 2022
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
Prev Previous commit
Next Next commit
Added tests
  • Loading branch information
@chgnrdv
chgnrdv committed Oct 19, 2022
commit 48b46a4c5d9b2b4581a7bd9cb380e5c4784c81ab
35 changes: 35 additions & 0 deletions Lib/test/test_imp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,41 @@ def test_find_and_load_checked_pyc(self):
mod = imp.load_module('mymod', file, path, description)
self.assertEqual(mod.x, 42)

def test_issue98354(self):
# _imp.create_builtin should raise TypeError
# if 'name' attribute of 'spec' argument is not a 'str' instance
Comment thread
chgnrdv marked this conversation as resolved.

create_builtin = support.get_attribute(_imp, "create_builtin")

class FakeSpec:
def __init__(self, name):
self.name = self
spec = FakeSpec("time")
with self.assertRaises(TypeError):
create_builtin(spec)

class FakeSpec2:
name = [1, 2, 3, 4]
spec = FakeSpec2()
with self.assertRaises(TypeError):
create_builtin(spec)

class UnicodeSubclass(str):
pass
class GoodSpec:
name = UnicodeSubclass("sys")
spec = GoodSpec()
bltin = create_builtin(spec)
import sys
self.assertEqual(bltin, sys)

class UnicodeSubclassFakeSpec(str):
def __init__(self, name):
self.name = self
spec = UnicodeSubclassFakeSpec("builtins")
bltin = create_builtin(spec)
import builtins
self.assertEqual(bltin, builtins)

class ReloadTests(unittest.TestCase):

Expand Down