OSDN Git Service

* cppinit.c (merge_include_chains): Check for brack being
authorzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 17 Feb 2002 02:54:20 +0000 (02:54 +0000)
committerzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 17 Feb 2002 02:54:20 +0000 (02:54 +0000)
NULL before attempting to merge it with qtail.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49814 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/cppinit.c

index 5ecdd9f..c992d2b 100644 (file)
@@ -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
index 717fb3f..b5ad937 100644 (file)
@@ -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