From 0d8e8ad4021aea83070f711f0c6899a72c1a4507 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Tue, 23 Aug 2022 11:13:53 +0100 Subject: [PATCH] GH-96187: Prevent _PyCode_GetExtra to return garbage for negative indexes (GH-96188) (cherry picked from commit 16ebae4cd4029205d932751f26c719c6cb8a6e92) Co-authored-by: Pablo Galindo Salgado --- .../2022-08-22-21-33-28.gh-issue-96187.W_6SRG.rst | 2 ++ Objects/codeobject.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-08-22-21-33-28.gh-issue-96187.W_6SRG.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-08-22-21-33-28.gh-issue-96187.W_6SRG.rst b/Misc/NEWS.d/next/Core and Builtins/2022-08-22-21-33-28.gh-issue-96187.W_6SRG.rst new file mode 100644 index 00000000000000..fd194faa68545d --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-08-22-21-33-28.gh-issue-96187.W_6SRG.rst @@ -0,0 +1,2 @@ +Fixed a bug that caused ``_PyCode_GetExtra`` to return garbage for negative +indexes. Patch by Pablo Galindo diff --git a/Objects/codeobject.c b/Objects/codeobject.c index c0151434489ad1..d7434ddefbc026 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -1337,7 +1337,7 @@ _PyCode_GetExtra(PyObject *code, Py_ssize_t index, void **extra) PyCodeObject *o = (PyCodeObject*) code; _PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra*) o->co_extra; - if (co_extra == NULL || co_extra->ce_size <= index) { + if (co_extra == NULL || index < 0 || co_extra->ce_size <= index) { *extra = NULL; return 0; }