aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <siarheit@google.com>2022-08-16 12:35:07 +0100
committerSergei Trofimovich <siarheit@google.com>2022-08-16 13:15:46 +0100
commit2b403297b111c990c331b5bbb6165b061ad2259b (patch)
tree92d3fffabf3332891535c3a5257aba0126f17405
parent6e790ca4615443fa395ac5cdba1ab6c87810985c (diff)
downloadgcc-2b403297b111c990c331b5bbb6165b061ad2259b.zip
gcc-2b403297b111c990c331b5bbb6165b061ad2259b.tar.gz
gcc-2b403297b111c990c331b5bbb6165b061ad2259b.tar.bz2
driver: fix environ corruption after putenv() [PR106624]
The bug appeared afte r13-2010-g1270ccda70ca09 "Factor out jobserver_active_p" slightly changed `putenv()` use from allocating to non-allocating: -xputenv (concat ("MAKEFLAGS=", dup, NULL)); +xputenv (jinfo.skipped_makeflags.c_str ()); `xputenv()` (and `putenv()`) don't copy strings and only store the pointer in the `environ` global table. As a result `environ` got corrupted as soon as `jinfo.skipped_makeflags` store got deallocated. This started causing bootstrap crashes in `execv()` calls: xgcc: fatal error: cannot execute '/build/build/./prev-gcc/collect2': execv: Bad address The change restores memory allocation for `xputenv()` argument. gcc/ PR driver/106624 * gcc.cc (driver::detect_jobserver): Allocate storage xputenv() argument using xstrdup().
-rw-r--r--gcc/gcc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index cac11c1..75ca0ec 100644
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -9182,7 +9182,7 @@ driver::detect_jobserver () const
{
jobserver_info jinfo;
if (!jinfo.is_active && !jinfo.skipped_makeflags.empty ())
- xputenv (jinfo.skipped_makeflags.c_str ());
+ xputenv (xstrdup (jinfo.skipped_makeflags.c_str ()));
}
/* Determine what the exit code of the driver should be. */