diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/readelf.c | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5be10750..66f7ead1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-09-03 Mark Wielaard <[email protected]> + + * readelf.c (handle_core_item): Handle right shift >= 32 bits. + 2015-08-11 Mark Wielaard <[email protected]> * elflint.c (check_sections): When gnuld and a NOBITS section falls diff --git a/src/readelf.c b/src/readelf.c index d3c2b6b4..aab8b5cc 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -8474,8 +8474,16 @@ handle_core_item (Elf *core, const Ebl_Core_Item *item, const void *desc, unsigned int w = negate ? ~*i : *i; while (w != 0) { - int n = ffs (w); - w >>= n; + /* Note that a right shift equal to (or greater than) + the number of bits of w is undefined behaviour. In + particular when the least significant bit is bit 32 + (w = 0x8000000) then w >>= n is undefined. So + explicitly handle that case separately. */ + unsigned int n = ffs (w); + if (n < sizeof (w) * 8) + w >>= n; + else + w = 0; bit += n; if (lastbit != 0 && lastbit + 1 == bit) |