Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions Lib/test/test_capi/test_dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -635,11 +635,42 @@ class DictSubtype(dict): ...
self.assertIs(type(d), DictSubtype)
self.assertEqual(d, DictSubtype({}))

# non str keys:
d = {1: 'a', 2: 'b', 3: 'c', None: 'f'}
f = as_frozendict(d)
self.assertIs(type(f), frozendict)
self.assertEqual(f, frozendict({1: 'a', 2: 'b', 3: 'c', None: 'f'}))
self.assertIs(type(d), dict)
self.assertEqual(d, {})

d = DictSubtype({1: 'a', 2: 'b', 3: 'c', None: 'f'})

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you add this test, is it still useful to keep d = DictSubtype(x=123) test above?

f = as_frozendict(d)
self.assertIs(type(f), frozendict)
self.assertEqual(f, frozendict({1: 'a', 2: 'b', 3: 'c', None: 'f'}))
self.assertIs(type(d), DictSubtype)
self.assertEqual(d, DictSubtype({}))

# wrong inputs:
for wrong_input in (frozendict(), [], None):
with self.subTest(wrong_input=wrong_input):
with self.assertRaises(SystemError):
as_frozendict(wrong_input)

# gh-161767: check embedded values

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# gh-161767: check embedded values
# gh-161767: check type with inline values and dict with embedded values

class Regular: ...

for klass in (Regular, _testcapi.ManagedDictType):
with self.subTest(klass=klass):
instance = klass()
instance.key = 'value'
with self.assertRaisesRegex(ValueError, 'embedded values'):

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
with self.assertRaisesRegex(ValueError, 'embedded values'):
with self.assertRaisesRegex(ValueError, 'dict with embedded values'):

as_frozendict(instance.__dict__)

self.assertEqual(instance.__dict__, {'key': 'value'})
# Both of these actions were needed to cause a crash:
instance.other = 'new'
del instance # must not crash

def test_frozendict_check(self):
# Test PyFrozenDict_Check()
check = _testcapi.frozendict_check
Expand Down
7 changes: 7 additions & 0 deletions Objects/dictobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -8700,6 +8700,13 @@ PyDict_AsFrozenDictAndClear(PyObject *dict)
return NULL;
}

PyDictObject *ma = (PyDictObject*)dict;
if (ma->ma_values && ma->ma_values->embedded) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may safer to move the check inside transfer_keys_and_values_lock_held(), so it's protected by Py_BEGIN_CRITICAL_SECTION(dict). So transfer_keys_and_values_lock_held() would return an error.

_PyDict_DetachFromObject() can also modify mp->ma_values, and mp->ma_values->embedded == 1 becomes mp->ma_values->embedded == 0.

Also, on MemoryError, PyObject_ClearManagedDict() sets dict->ma_values = NULL;.

PyErr_SetString(PyExc_ValueError,
"can't convert dict with embedded values");
return NULL;
}

PyObject *res = frozendict_new_untracked(&PyFrozenDict_Type);
if (res == NULL) {
return NULL;
Expand Down
Loading