projects
/
binutils-gdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f58849b
)
Avoid dereferencing map->end().
author
Ian Lance Taylor
<iant@google.com>
Sun, 23 Sep 2007 03:16:47 +0000
(
03:16
+0000)
committer
Ian Lance Taylor
<iant@google.com>
Sun, 23 Sep 2007 03:16:47 +0000
(
03:16
+0000)
gold/merge.cc
patch
|
blob
|
history
diff --git
a/gold/merge.cc
b/gold/merge.cc
index d2972fdfdb1c89a61c00d92148fca2911442c05d..f6f45c9cd063d1487ca8fcea22afa724f8555022 100644
(file)
--- 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)
{