From 599956cfe164ca2f4f7d04b90aee1db98930a023 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 18 Dec 2019 23:03:28 +1030 Subject: [PATCH] ld signed overflow fix * pe-dll.c (pe_get32, pe_as32): Avoid signed overflow. --- ld/ChangeLog | 4 ++++ ld/pe-dll.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 417bb151c1..7c36a5dae1 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2019-12-18 Alan Modra + + * pe-dll.c (pe_get32, pe_as32): Avoid signed overflow. + 2019-12-17 Alan Modra * testsuite/ld-avr/lds-mega.d: Adjust symbols to suit objdump change. diff --git a/ld/pe-dll.c b/ld/pe-dll.c index 4679fca6d5..7f45546aaf 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -3289,7 +3289,7 @@ pe_get32 (bfd *abfd, int where) bfd_seek (abfd, (file_ptr) where, SEEK_SET); bfd_bread (b, (bfd_size_type) 4, abfd); - return b[0] + (b[1] << 8) + (b[2] << 16) + (b[3] << 24); + return b[0] + (b[1] << 8) + (b[2] << 16) + ((unsigned) b[3] << 24); } static unsigned int @@ -3297,7 +3297,7 @@ pe_as32 (void *ptr) { unsigned char *b = ptr; - return b[0] + (b[1] << 8) + (b[2] << 16) + (b[3] << 24); + return b[0] + (b[1] << 8) + (b[2] << 16) + ((unsigned) b[3] << 24); } bfd_boolean -- 2.34.1