Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-88116: Avoid undefined behavior when decoding varints in code objects (#94375)

This commit is contained in:
Pablo Galindo Salgado 2022-06-28 14:24:54 +01:00 committed by GitHub
parent 44fa03d748
commit c485ec014c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst Normal file
View File

@ -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

16
Objects/codeobject.c
View File

@ -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);
}