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
This commit is contained in:
Paolo Carlini 2011-11-09 17:26:37 +00:00 committed by Paolo Carlini
parent e8089b4a9d
commit 9b5e84de9d
2 changed files with 10 additions and 2 deletions

View File

@ -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]):

View File

@ -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;