summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Weinberg <zack@codesourcery.com>2002-02-17 02:54:20 +0000
committerZack Weinberg <zack@gcc.gnu.org>2002-02-17 02:54:20 +0000
commitafb58288e4b0babad13b41c14ce592b4c9c39452 (patch)
tree098308f45cf04e4ed775e3e012d911747e217596
parentd2af4dbdccb120e90733ff1b144f4c86c16ca305 (diff)
downloadgcc-afb58288e4b0babad13b41c14ce592b4c9c39452.tar.gz
cppinit.c (merge_include_chains): Check for brack being NULL before attempting to merge it with qtail.
* cppinit.c (merge_include_chains): Check for brack being NULL before attempting to merge it with qtail. From-SVN: r49814
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cppinit.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ecdd9f0dde..c992d2bd225 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-16 Zack Weinberg <zack@codesourcery.com>
+
+ * cppinit.c (merge_include_chains): Check for brack being
+ NULL before attempting to merge it with qtail.
+
2002-02-16 Andrew Cagney <ac131313@redhat.com>
* config/rs6000/netbsd.h (PREFERRED_DEBUGGING_TYPE): Set to
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 717fb3ff72c..b5ad93719e4 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -376,7 +376,8 @@ merge_include_chains (pfile)
qtail->next = brack;
/* If brack == qtail, remove brack as it's simpler. */
- if (INO_T_EQ (qtail->ino, brack->ino) && qtail->dev == brack->dev)
+ if (brack && INO_T_EQ (qtail->ino, brack->ino)
+ && qtail->dev == brack->dev)
brack = remove_dup_dir (pfile, qtail);
}
else