From 3254dc0a2b12ba4cddbd2a97b8720f79b5ee24cd Mon Sep 17 00:00:00 2001 From: Kai Wang Date: Sun, 30 Jun 2013 21:06:47 +0000 Subject: [PATCH] When decoding SLEB128, make sure sign extension is performed for 64-bit integers. MFC after: 3 days --- lib/libdwarf/dwarf_init.c | 2 +- lib/libdwarf/dwarf_loc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libdwarf/dwarf_init.c b/lib/libdwarf/dwarf_init.c index 6ebc7d90d68..ce8536337b2 100644 --- a/lib/libdwarf/dwarf_init.c +++ b/lib/libdwarf/dwarf_init.c @@ -192,7 +192,7 @@ dwarf_read_sleb128(Elf_Data **dp, uint64_t *offsetp) shift += 7; } while ((b & 0x80) != 0); - if (shift < 32 && (b & 0x40) != 0) + if (shift < 64 && (b & 0x40) != 0) ret |= (-1 << shift); return ret; diff --git a/lib/libdwarf/dwarf_loc.c b/lib/libdwarf/dwarf_loc.c index 6449706c2cc..12d4cab6249 100644 --- a/lib/libdwarf/dwarf_loc.c +++ b/lib/libdwarf/dwarf_loc.c @@ -46,7 +46,7 @@ dwarf_decode_sleb128(uint8_t **dp) shift += 7; } while ((b & 0x80) != 0); - if (shift < 32 && (b & 0x40) != 0) + if (shift < 64 && (b & 0x40) != 0) ret |= (-1 << shift); *dp = src;