From: Michael Snyder <msnyder@vmware.com>
Date: Wed, 25 Jul 2007 02:12:33 +0000 (+0000)
Subject: 2007-07-23  Michael Snyder  <msnyder@access-company.com>
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f52df7d9b76f8efc9048db80102607178896ee75;p=deliverable%2Fbinutils-gdb.git

2007-07-23  Michael Snyder  <msnyder@access-company.com>

	* solib-svr4.c (svr4_fetch_objfile_link_map): Null pointer check of
	'buffer' must cover both branches that call strcmp (Coverity).
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b4573836a4..27c3b36c3e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,8 +1,9 @@
-2007-07-05  Michael Snyder  <msnyder@access-company.com>
+2007-07-24  Michael Snyder  <msnyder@access-company.com>
 
-	* stack.c (print_frame_args): Check return value of lookup_symbol.
+	* solib-svr4.c (svr4_fetch_objfile_link_map): Null pointer check of
+	'buffer' must cover both branches that call strcmp (Coverity).
 
-2007-07-24  Michael Snyder  <msnyder@access-company.com>
+	* stack.c (print_frame_args): Check return value of lookup_symbol.
 
 	* ax-gdb.c (find_field): Guard against null ptr.
 
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 1ef2d1e06c..fc608de79f 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -839,8 +839,11 @@ svr4_fetch_objfile_link_map (struct objfile *objfile)
 	  /* Is this the linkmap for the file we want?  */
 	  /* If the file is not a shared library and has no name,
 	     we are sure it is the main executable, so we return that.  */
-	  if ((buffer && strcmp (buffer, objfile->name) == 0)
-              || (!(objfile->flags & OBJF_SHARED) && (strcmp (buffer, "") == 0)))
+
+	  if (buffer 
+	      && ((strcmp (buffer, objfile->name) == 0)
+		  || (!(objfile->flags & OBJF_SHARED) 
+		      && (strcmp (buffer, "") == 0))))
   	    {
     	      do_cleanups (old_chain);
     	      return lm;