diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 4 | ||||
| -rw-r--r-- | gold/fileread.cc | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 0f67551..dc84079 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,7 @@ +2008-09-16 Ian Lance Taylor <iant@google.com> + + * fileread.cc (make_view): Add casts to avoid warning. + 2008-09-16 Alexandre Oliva <aoliva@redhat.com> * i386.cc (Target_i386::define_tls_base_symbol): Update comments. diff --git a/gold/fileread.cc b/gold/fileread.cc index f56e33e..883f8c8 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -356,7 +356,9 @@ File_read::make_view(off_t start, section_size_type size, gold_assert(size > 0); // Check that start and end of the view are within the file. - if (start > this->size_ || size > this->size_ - start) + 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(), |