From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Wed, 9 Nov 2011 17:26:37 +0000 (+0000)
Subject: re PR preprocessor/51061 (Deprecated -I- option causes segfault)
X-Git-Tag: releases/gcc-4.7.0~2306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b5e84de9db21d613c12f6bf9d4907b8aae05242;p=thirdparty%2Fgcc.git

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 f011be7d8a12..ce1bac494277 100644
--- 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 aab6e15ab1a7..07a765f3fc07 100644
--- 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;