[Python-checkins] [3.11] GH-95060: Fix PyCode_Addr2Location when addrq < 0 (GH-95094)

miss-islington webhook-mailer at python.org
Thu Jul 21 11:23:42 EDT 2022


https://github.com/python/cpython/commit/e693f84cf79d81a10c9c63ab46cdf0fe2ebe9c10
commit: e693f84cf79d81a10c9c63ab46cdf0fe2ebe9c10
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T08:23:06-07:00
summary:

[3.11] GH-95060: Fix PyCode_Addr2Location when addrq < 0 (GH-95094)



(cherry picked from commit a6daaf2a132efbb1965b4502ff8a8cf3b5afed0e)


Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst
M Objects/codeobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst
new file mode 100644
index 0000000000000..160999e82bf08
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst	
@@ -0,0 +1,2 @@
+Undocumented ``PyCode_Addr2Location`` function now properly returns when
+``addrq`` argument is less than zero.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 4859b1ecebe50..35576a283b824 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -969,6 +969,7 @@ PyCode_Addr2Location(PyCodeObject *co, int addrq,
     if (addrq < 0) {
         *start_line = *end_line = co->co_firstlineno;
         *start_column = *end_column = 0;
+        return 1;
     }
     assert(addrq >= 0 && addrq < _PyCode_NBYTES(co));
     PyCodeAddressRange bounds;



More information about the Python-checkins mailing list