cppinit.c (merge_include_chains): Check for brack being NULL before attempting to...

	* cppinit.c (merge_include_chains): Check for brack being
	NULL before attempting to merge it with qtail.

From-SVN: r49996

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a01d55607fde6479da780ce7e0405e34e328f84f..f922d01756a9b1ebb00230243edabaf839b64e0d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-23  Zack Weinberg  <zack@codesourcery.com>
+
+       * cppinit.c (merge_include_chains): Check for brack being
+       NULL before attempting to merge it with qtail.
+
 2002-02-20  Release Manager
 
        * GCC 3.0.4 Released.

diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index ad7f2b83cfa46ba4f27b0a3c6e50fdc09eb7383b..b8f4808a3010f4291beba17dd9faa856968cf479 100644 (file)
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -358,7 +358,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