Update check for invalid values in pe_bfd_read_buildid function.

PR 22373
	* peicode.h (pe_bfd_read_buildid): Revise check for invalid size
	and offset in light of further possible bogus values.
This commit is contained in:
Nick Clifton 2017-11-01 12:37:33 +00:00
parent ee357486aa
commit e0115a8446
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2017-11-01 Nick Clifton <nickc@redhat.com>
PR 22373
* peicode.h (pe_bfd_read_buildid): Revise check for invalid size
and offset in light of further possible bogus values.
2017-11-01 Alan Modra <amodra@gmail.com>
PR 22374

View File

@ -1329,9 +1329,8 @@ pe_bfd_read_buildid (bfd *abfd)
/* PR 20605 and 22373: Make sure that the data is really there.
Note - since we are dealing with unsigned quantities we have
to be careful to check for potential overflows. */
if (dataoff > section->size
|| size > section->size
|| dataoff + size > section->size)
if (dataoff >= section->size
|| size > section->size - dataoff)
{
_bfd_error_handler (_("%B: Error: Debug Data ends beyond end of debug directory."),
abfd);