summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst2
-rw-r--r--Objects/codeobject.c16
2 files changed, 10 insertions, 8 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst
new file mode 100644
index 0000000..a8347cf
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst
@@ -0,0 +1,2 @@
+Fix an issue when reading line numbers from code objects if the encoded line
+numbers are close to ``INT_MIN``. Patch by Pablo Galindo
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index c38c51b..6f2a837 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -354,9 +354,9 @@ init_code(PyCodeObject *co, struct _PyCodeConstructor *con)
static int
scan_varint(const uint8_t *ptr)
{
- int read = *ptr++;
- int val = read & 63;
- int shift = 0;
+ unsigned int read = *ptr++;
+ unsigned int val = read & 63;
+ unsigned int shift = 0;
while (read & 64) {
read = *ptr++;
shift += 6;
@@ -368,7 +368,7 @@ scan_varint(const uint8_t *ptr)
static int
scan_signed_varint(const uint8_t *ptr)
{
- int uval = scan_varint(ptr);
+ unsigned int uval = scan_varint(ptr);
if (uval & 1) {
return -(int)(uval >> 1);
}
@@ -847,9 +847,9 @@ read_byte(PyCodeAddressRange *bounds)
static int
read_varint(PyCodeAddressRange *bounds)
{
- int read = read_byte(bounds);
- int val = read & 63;
- int shift = 0;
+ unsigned int read = read_byte(bounds);
+ unsigned int val = read & 63;
+ unsigned int shift = 0;
while (read & 64) {
read = read_byte(bounds);
shift += 6;
@@ -861,7 +861,7 @@ read_varint(PyCodeAddressRange *bounds)
static int
read_signed_varint(PyCodeAddressRange *bounds)
{
- int uval = read_varint(bounds);
+ unsigned int uval = read_varint(bounds);
if (uval & 1) {
return -(int)(uval >> 1);
}