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: r49814

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ecdd9f0dde0ba91a5fc346e4e6a3e9f0bc65648..c992d2bd225768ad3b669d3b3027d8beaedde214 100644 (file)
--- 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 717fb3ff72c9575929222f4d24efbf79c38cb843..b5ad93719e4c5e7b113919d5e13ed4a3e05bdf30 100644 (file)
--- 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