diff options
| author | Ian Lance Taylor <iant@google.com> | 2007-09-23 03:16:47 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2007-09-23 03:16:47 +0000 |
| commit | c077629be8c6c1021243e0efe48cc56a3c434626 (patch) | |
| tree | a6f56d62a1e73172fcd49b9973f3eda51e261d1c /gold/merge.cc | |
| parent | f58849bd46300cfde2098b83eeecaa899340fc7d (diff) | |
| download | gdb-c077629be8c6c1021243e0efe48cc56a3c434626.zip gdb-c077629be8c6c1021243e0efe48cc56a3c434626.tar.gz gdb-c077629be8c6c1021243e0efe48cc56a3c434626.tar.bz2 | |
Avoid dereferencing map->end().
Diffstat (limited to 'gold/merge.cc')
| -rw-r--r-- | gold/merge.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gold/merge.cc b/gold/merge.cc index d2972fd..f6f45c9 100644 --- a/gold/merge.cc +++ b/gold/merge.cc @@ -86,7 +86,8 @@ Output_merge_base::do_output_address(const Relobj* object, unsigned int shndx, // If MK is not in the map, lower_bound returns the next iterator // larger than it. - if (p->first.object != object + if (p == this->merge_map_.end() + || p->first.object != object || p->first.shndx != shndx || p->first.offset != offset) { |