From c077629be8c6c1021243e0efe48cc56a3c434626 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sun, 23 Sep 2007 03:16:47 +0000 Subject: [PATCH] Avoid dereferencing map->end(). --- gold/merge.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) { -- 2.7.4