Fix possible NULL pointer dereference in _PyThread_CurrentFrames (GH-… · python/cpython@c563b89 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 36.1k
• Star 77.2k

• Code
• Issues 5k+
• Pull requests 2.7k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit c563b89

Browse filesBrowse the repository at this point in the historyBrowse files

miss-islington

and

kumaraditya303

authored

Fix possible NULL pointer dereference in _PyThread_CurrentFrames (GH-96584)

(cherry picked from commit 88a7f66) Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>

1 parent fecda02 commit c563b89
Copy full SHA for c563b89

2 files changed

+7-1Lines changed: 7 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Misc/NEWS.d/next/Core and Builtins
  • 2022-09-05-15-07-25.gh-issue-96582.HEsL5s.rst
• Python
  • pystate.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Misc/NEWS.d/next/Core and Builtins/2022-09-05-15-07-25.gh-issue-96582.HEsL5s.rst‎

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ Fix possible ``NULL`` pointer dereference in ``_PyThread_CurrentFrames``. Patch by Kumar Aditya.

Collapse file

‎Python/pystate.c‎

Copy file name to clipboardExpand all lines: Python/pystate.c

+6-1Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1398,7 +1398,12 @@ _PyThread_CurrentFrames(void)
1398	1398	if (id == NULL) {
1399	1399	goto fail;
1400	1400	}
1401		- int stat = PyDict_SetItem(result, id, (PyObject *)_PyFrame_GetFrameObject(frame));
	1401	+ PyObject *frameobj = (PyObject *)_PyFrame_GetFrameObject(frame);
	1402	+ if (frameobj == NULL) {
	1403	+ Py_DECREF(id);
	1404	+ goto fail;
	1405	+ }
	1406	+ int stat = PyDict_SetItem(result, id, frameobj);
1402	1407	Py_DECREF(id);
1403	1408	if (stat < 0) {
1404	1409	goto fail;

0 commit comments

Comments

0 (0)