2011-11-09 Paolo Carlini <paolo.carlini@oracle.com>

	PR preprocessor/51061
	* incpath.c (merge_include_chains): Make sure to not pass null
	pointers to free_path.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f011be7..ce1bac4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2011-11-09  Paolo Carlini  <paolo.carlini@oracle.com>
 
+       PR preprocessor/51061
+       * incpath.c (merge_include_chains): Make sure to not pass null
+       pointers to free_path.
+
+2011-11-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
        * doc/invoke.texi ([Option Summary, C++ Language Options]):
        Add -Wzero-as-null-pointer-constant.
 

diff --git a/gcc/incpath.c b/gcc/incpath.c
index aab6e15..07a765f 100644 (file)
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -362,8 +362,10 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
 void
 split_quote_chain (void)
 {
-  free_path (heads[QUOTE], REASON_QUIET);
-  free_path (tails[QUOTE], REASON_QUIET);
+  if (heads[QUOTE])
+    free_path (heads[QUOTE], REASON_QUIET);
+  if (tails[QUOTE])
+    free_path (tails[QUOTE], REASON_QUIET);
   heads[QUOTE] = heads[BRACKET];
   tails[QUOTE] = tails[BRACKET];
   heads[BRACKET] = NULL;