Skip to content

gh-152959: Fix IndexError when <key> appears outside <dict> in plistlib #152970

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

Open
Wojusensei wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −1
Open

gh-152959: Fix IndexError when <key> appears outside <dict> in plistlib #152970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97fc83e
bpo-152959: Fix IndexError when <key> appears outside <dict> in plistlib
Wojusensei Jul 3, 2026
2c11ab0
gh-152798: Revert sys.thread_info.lock to 'semaphore'/None for consis…
Wojusensei Jul 4, 2026
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
3 changes: 3 additions & 0 deletions Lib/plistlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@ def end_dict(self):
self.stack.pop()

def end_key(self):
if not self.stack:
raise InvalidFileException("'key' element found outside of a 'dict' at line %d" %
self.parser.CurrentLineNumber)
if self.current_key or not isinstance(self.stack[-1], dict):
raise ValueError("unexpected key at line %d" %
self.parser.CurrentLineNumber)
Expand Down
6 changes: 5 additions & 1 deletion Python/thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,15 @@ PyThread_GetInfo(void)
#ifdef HAVE_PTHREAD_STUBS
value = Py_NewRef(Py_None);
#else
value = PyUnicode_FromString("pymutex");
#ifdef MS_WINDOWS
value = Py_NewRef(Py_None);
#else
value = PyUnicode_FromString("semaphore");
if (value == NULL) {
Py_DECREF(threadinfo);
return NULL;
}
#endif
#endif
PyStructSequence_SET_ITEM(threadinfo, pos++, value);

Expand Down
Loading