[SCM] archer-sergiodj-stap: fix inverted test; avoids erroneous probe complaint don't increment a NULL value

[SCM] archer-sergiodj-stap: fix inverted test; avoids erroneous probe complaint don't increment a NULL value

[tromey]

The branch, archer-sergiodj-stap has been updated
       via  4c043a5d0f3c8291157b850ba117045555fac198 (commit)
      from  433108a197ec97c60aba6f6db28009956224a387 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 4c043a5d0f3c8291157b850ba117045555fac198
Author: Tom Tromey <tromey@redhat.com>
Date:   Tue Jul 26 12:25:19 2011 -0600

    fix inverted test; avoids erroneous probe complaint
    don't increment a NULL value

-----------------------------------------------------------------------

Summary of changes:
 gdb/elfread.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

First 500 lines of diff:
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 967f2ef..9172ab8 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1627,10 +1627,12 @@ handle_probe (struct objfile *objfile, struct sdt_note *el,
 			  (unsigned long *) el->data
 			  + el->size - (unsigned long *) ret->name);
 
-      if (ret->args++ != NULL
-	  || memchr (ret->args, '\0', (unsigned long *) el->data
-		     + el->size - (unsigned long *) ret->name)
-	  != el->data + el->size - 1)
+      if (ret->args != NULL)
+	++ret->args;
+      if (ret->args == NULL
+	  || (memchr (ret->args, '\0', (unsigned long *) el->data
+		      + el->size - (unsigned long *) ret->name)
+	      != el->data + el->size - 1))
 	complaint (&symfile_complaints, _("corrupt probe when reading `%s'"),
 		   objfile->name);
     }


hooks/post-receive
--
Repository for Project Archer.