diff options
| author | Mark Harmstone <mark@harmstone.com> | 2021-04-14 11:53:30 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2021-04-14 11:55:16 +0100 |
| commit | 6be872a439e15d12e86e7c5889f9e0b7804e59c6 (patch) | |
| tree | 350e9e293e9af44e2c085f992c3d7fb79e3f0b70 /binutils | |
| parent | ac4d323ea04501ad1c4eba77635b3f122c90ef85 (diff) | |
| download | gdb-6be872a439e15d12e86e7c5889f9e0b7804e59c6.zip gdb-6be872a439e15d12e86e7c5889f9e0b7804e59c6.tar.gz gdb-6be872a439e15d12e86e7c5889f9e0b7804e59c6.tar.bz2 | |
Ignore trailing bytes at the end of a Windows Resource Version structure.
PR 27686
* resbin.c (bin_to_res_version): Ignore any trailing bytes at the
end of the structure.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/resbin.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index daa258c..8929c07 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2021-04-14 Mark Harmstone <mark@harmstone.com> + + PR 27686 + * resbin.c (bin_to_res_version): Ignore any trailing bytes at the + end of the structure. + 2021-04-14 Frederic Cambus <fred@statdns.com> * readelf.c (get_netbsd_elfcore_note_type): Remove unneeded #ifdef diff --git a/binutils/resbin.c b/binutils/resbin.c index b6f61f5..ba31077 100644 --- a/binutils/resbin.c +++ b/binutils/resbin.c @@ -967,6 +967,9 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data, rc_uint_type lengt if (type != 0) fatal (_("unexpected version type %d"), (int) type); + /* PR 27686: Ignore any padding bytes after the end of the version structure. */ + length = verlen; + data += off; length -= off; |