diff options
author | kaiw <kaiw@FreeBSD.org> | 2013-06-30 21:06:47 +0000 |
---|---|---|
committer | kaiw <kaiw@FreeBSD.org> | 2013-06-30 21:06:47 +0000 |
commit | 1db16779a5401fa798771dadcc4e78be25374a9b (patch) | |
tree | 5d1b33175f4c08247112e91258eb54dfaf8946e6 /lib/libdwarf | |
parent | cf3175531d237ca749a4e1bd0d8d5b6cc7c4dd87 (diff) | |
download | FreeBSD-src-1db16779a5401fa798771dadcc4e78be25374a9b.zip FreeBSD-src-1db16779a5401fa798771dadcc4e78be25374a9b.tar.gz |
When decoding SLEB128, make sure sign extension is performed for
64-bit integers.
MFC after: 3 days
Diffstat (limited to 'lib/libdwarf')
-rw-r--r-- | lib/libdwarf/dwarf_init.c | 2 | ||||
-rw-r--r-- | 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 6ebc7d9..ce85363 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 6449706..12d4cab 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; |