diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/incpath.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f011be7..ce1bac4 100644 --- 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 --- 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; |