OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix seeks and reads past the end of a BIM

This commit is contained in:
Nick Clifton 2000-01-21 20:52:35 +00:00
parent 13392b77a7
commit 2e4bb80ea1
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2000-01-21 Nick Clifton <nickc@cygnus.com>
* libbfd.c (bfd_read): Do not attempt to get a negativly sized
amount from a bfd_in_memory structure.
(bfd_seek): Do not allow seeks past the end of a bfd_in_memory
structure.
2000-01-14 Nick Clifton <nickc@cygnus.com>
* linker.c (default_indirect_link_order): oops - fix incorrectly

17
bfd/libbfd.c
View File

@ -274,7 +274,10 @@ bfd_read (ptr, size, nitems, abfd)
get = size * nitems;
if (abfd->where + get > bim->size)
{
get = bim->size - abfd->where;
if (bim->size < abfd->where)
get = 0;
else
get = bim->size - abfd->where;
bfd_set_error (bfd_error_file_truncated);
}
memcpy (ptr, bim->buffer + abfd->where, get);
@ -677,10 +680,22 @@ bfd_seek (abfd, position, direction)
if ((abfd->flags & BFD_IN_MEMORY) != 0)
{
struct bfd_in_memory *bim;
bim = (struct bfd_in_memory *) abfd->iostream;
if (direction == SEEK_SET)
abfd->where = position;
else
abfd->where += position;
if (abfd->where > bim->size)
{
abfd->where = bim->size;
bfd_set_error (bfd_error_file_truncated);
return -1;
}
return 0;
}