diff options
| author | Nick Clifton <nickc@redhat.com> | 2016-07-28 15:37:16 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2016-07-28 15:37:16 +0100 |
| commit | 4931146e91c3c8208f1e0b8462b8f33e70da506a (patch) | |
| tree | a9f43d38c4e19c1635af081bfaef07625d630e4f /binutils/resbin.c | |
| parent | ff20cab8a222c43de501a340016e11cae6a272a7 (diff) | |
| download | gdb-4931146e91c3c8208f1e0b8462b8f33e70da506a.zip gdb-4931146e91c3c8208f1e0b8462b8f33e70da506a.tar.gz gdb-4931146e91c3c8208f1e0b8462b8f33e70da506a.tar.bz2 | |
Fix decoding of Windows resources.
PR binutils/17512
* rescoff.c (read_coff_res_dir): Fix detection of buffer overrun.
* resbin.c (bin_to_res_version): Allow for the padded length of a
version block to be longer than the recorded length. Skip padding
bytes.
Diffstat (limited to 'binutils/resbin.c')
| -rw-r--r-- | binutils/resbin.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/binutils/resbin.c b/binutils/resbin.c index 03d3010..9ca5408 100644 --- a/binutils/resbin.c +++ b/binutils/resbin.c @@ -961,9 +961,10 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data, rc_uint_type lengt get_version_header (wrbfd, data, length, "VS_VERSION_INFO", (unichar **) NULL, &verlen, &vallen, &type, &off); - if ((unsigned int) verlen != length) - fatal (_("version length %d does not match resource length %lu"), - (int) verlen, (unsigned long) length); + /* PR 17512: The verlen field does not include padding length. */ + if (verlen > length) + fatal (_("version length %lu greater than resource length %lu"), + verlen, length); if (type != 0) fatal (_("unexpected version type %d"), (int) type); @@ -1164,8 +1165,15 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data, rc_uint_type lengt vallen -= 4; } } + else if (ch == 0) + { + if (length == 8) + /* Padding - skip. */ + break; + fatal (_("nul bytes found in version string")); + } else - fatal (_("unexpected version string")); + fatal (_("unexpected version string character: %x"), ch); vi->next = NULL; *pp = vi; |