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

miss-islington · Fidget-Spinner · web-flow · commit e693f84cf79d · 2022-07-21T08:23:06.000-07:00
(cherry picked from commit a6daaf2) Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Undocumented ``PyCode_Addr2Location`` function now properly returns when
	`2`	+``addrq`` argument is less than zero.
Original file line number	Diff line number	Diff line change
`@@ -969,6 +969,7 @@ PyCode_Addr2Location(PyCodeObject *co, int addrq,`
`969`	`969`	`if (addrq < 0) {`
`970`	`970`	`start_line = end_line = co->co_firstlineno;`
`971`	`971`	`start_column = end_column = 0;`
	`972`	`+ return 1;`
`972`	`973`	`}`
`973`	`974`	`assert(addrq >= 0 && addrq < _PyCode_NBYTES(co));`
`974`	`975`	`PyCodeAddressRange bounds;`