espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 00:59:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR gold/13288

Browse Source 
* gold/fileread.cc (File_read::find_view): Add assert.
	(File_read::make_view): Move bounds check (replace with assert)...
	(File_read::find_or_make_view): ... to here.
This commit is contained in:
Cary Coutant
2011-10-17 23:36:43 +00:00
parent 42dd20afd3
commit cdd7e2444c
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gold/ChangeLog
View File

@ -1,3 +1,10 @@
2011-10-17 Cary Coutant <ccoutant@google.com>
PR gold/13288
* gold/fileread.cc (File_read::find_view): Add assert.
(File_read::make_view): Move bounds check (replace with assert)...
(File_read::find_or_make_view): ... to here.
2011-10-12 Cary Coutant <ccoutant@google.com> 2011-10-12 Cary Coutant <ccoutant@google.com>
* gold/output.cc (Output_file::open_base_file): Handle case where * gold/output.cc (Output_file::open_base_file): Handle case where

27
gold/fileread.cc
View File

@ -329,6 +329,10 @@ inline File_read::View*
File_read::find_view(off_t start, section_size_type size, File_read::find_view(off_t start, section_size_type size,
unsigned int byteshift, File_read::View** vshifted) const unsigned int byteshift, File_read::View** vshifted) const
{ {
gold_assert(start <= this->size_
&& (static_cast<unsigned long long>(size)
<= static_cast<unsigned long long>(this->size_ - start)));
if (vshifted != NULL) if (vshifted != NULL)
*vshifted = NULL; *vshifted = NULL;
@ -456,16 +460,9 @@ File_read::make_view(off_t start, section_size_type size,
unsigned int byteshift, bool cache) unsigned int byteshift, bool cache)
{ {
gold_assert(size > 0); gold_assert(size > 0);
gold_assert(start <= this->size_
// Check that start and end of the view are within the file. && (static_cast<unsigned long long>(size)
if (start > this->size_ <= static_cast<unsigned long long>(this->size_ - start)));
|| (static_cast<unsigned long long>(size)
> static_cast<unsigned long long>(this->size_ - start)))
gold_fatal(_("%s: attempt to map %lld bytes at offset %lld exceeds "
"size of file; the file may be corrupt"),
this->filename().c_str(),
static_cast<long long>(size),
static_cast<long long>(start));
off_t poff = File_read::page_offset(start); off_t poff = File_read::page_offset(start);
@ -523,6 +520,16 @@ File_read::View*
File_read::find_or_make_view(off_t offset, off_t start, File_read::find_or_make_view(off_t offset, off_t start,
section_size_type size, bool aligned, bool cache) section_size_type size, bool aligned, bool cache)
{ {
// Check that start and end of the view are within the file.
if (start > this->size_
|| (static_cast<unsigned long long>(size)
> static_cast<unsigned long long>(this->size_ - start)))
gold_fatal(_("%s: attempt to map %lld bytes at offset %lld exceeds "
"size of file; the file may be corrupt"),
this->filename().c_str(),
static_cast<long long>(size),
static_cast<long long>(start));
unsigned int byteshift; unsigned int byteshift;
if (offset == 0) if (offset == 0)
byteshift = 0; byteshift = 0;