From: Ian Lance Taylor <iant@google.com>
Date: Sun, 23 Sep 2007 03:16:47 +0000 (+0000)
Subject: Avoid dereferencing map->end().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c077629be8c6c1021243e0efe48cc56a3c434626;p=binutils-gdb.git

Avoid dereferencing map->end().
---

diff --git a/gold/merge.cc b/gold/merge.cc
index d2972fdfdb1..f6f45c9cd06 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)
     {