re PR preprocessor/51061 (Deprecated -I- option causes segfault)

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.

From-SVN: r181216

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f011be7d8a12ad203d4eae883aa4b6c9e06ab210..ce1bac4942771e6f4b2b8ccec9fa597cc1f2e3f8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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]):

diff --git a/gcc/incpath.c b/gcc/incpath.c
index aab6e15ab1a7fd3c6a5db0f212df9af926e4a292..07a765f3fc07ec7ca25c7498ba0d10c857bc05d9 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;