From de9a793edf281596d955cf8d42a229d82d22ab27 Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Mon, 22 Nov 2010 21:18:15 +0000 Subject: [PATCH] re PR driver/43335 (Driver crashes dereferencing a null pointer if it can't find lto-wrapper) 2010-11-22 Dmitry Gorbachev PR driver/43335 * gcc.c (main): Don't crash when lto-wrapper program is not found. From-SVN: r167052 --- gcc/ChangeLog | 5 +++++ gcc/gcc.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a12565619e1..43f469670ee 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-11-22 Dmitry Gorbachev + + PR driver/43335 + * gcc.c (main): Don't crash when lto-wrapper program is not found. + 2010-11-22 Joern Rennecke PR target/46608 diff --git a/gcc/gcc.c b/gcc/gcc.c index fb981716b2e..99d4f480d56 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -6074,6 +6074,7 @@ main (int argc, char **argv) int num_linker_inputs = 0; char *explicit_link_files; char *specs_file; + char *lto_wrapper_file; const char *p; struct user_specs *uptr; char **old_argv = argv; @@ -6412,9 +6413,10 @@ main (int argc, char **argv) /* Set up to remember the pathname of the lto wrapper. */ - lto_wrapper_spec = find_a_file (&exec_prefixes, "lto-wrapper", X_OK, false); - if (lto_wrapper_spec) + lto_wrapper_file = find_a_file (&exec_prefixes, "lto-wrapper", X_OK, false); + if (lto_wrapper_file) { + lto_wrapper_spec = lto_wrapper_file; obstack_init (&collect_obstack); obstack_grow (&collect_obstack, "COLLECT_LTO_WRAPPER=", sizeof ("COLLECT_LTO_WRAPPER=") - 1); -- 2.30.2