aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sandiford <r.sandiford@uk.ibm.com>2009-06-02 19:04:39 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2009-06-02 19:04:39 +0000
commit51136ae8188c4849ae4fb9451c26ef51f9801d7a (patch)
tree8e1c4102d3c40d7527e0ec7628300736d8e0be8b
parent7f142d333aa8e34f00195a9fffd549a458921434 (diff)
downloadgcc-51136ae8188c4849ae4fb9451c26ef51f9801d7a.zip
gcc-51136ae8188c4849ae4fb9451c26ef51f9801d7a.tar.gz
gcc-51136ae8188c4849ae4fb9451c26ef51f9801d7a.tar.bz2
collect2.c (ignore_library): Avoid premature post-increment and null deference.
gcc/ * collect2.c (ignore_library): Avoid premature post-increment and null deference. From-SVN: r148095
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/collect2.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 26a6edd..d56760b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2009-06-02 Richard Sandiford <r.sandiford@uk.ibm.com>
+ * collect2.c (ignore_library): Avoid premature post-increment
+ and null deference.
+
+2009-06-02 Richard Sandiford <r.sandiford@uk.ibm.com>
+
* Makefile.in (libgcc.mvars): Add TARGET_SYSTEM_ROOT.
* config/rs6000/aix.h (LINK_SYSCALLS_SPEC): Add %R to the
!CROSS_DIRECTORY_STRUCTURE alternative and use it for
diff --git a/gcc/collect2.c b/gcc/collect2.c
index d15a81a..a500147 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -2448,9 +2448,11 @@ static int ignore_library (const char *);
static int
ignore_library (const char *name)
{
- const char *const *p = &aix_std_libs[0];
- while (*p++ != NULL)
- if (! strcmp (name, *p)) return 1;
+ const char *const *p;
+
+ for (p = &aix_std_libs[0]; *p != NULL; ++p)
+ if (strcmp (name, *p) == 0)
+ return 1;
return 0;
}
#endif /* COLLECT_EXPORT_LIST */