summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Rytarowski <n54@gmx.com>2018-02-07 14:05:57 +0000
committerKamil Rytarowski <n54@gmx.com>2018-02-07 14:05:57 +0000
commitccb970ee03b583b96ed2984d12ec4545710601b7 (patch)
tree1b79d48d797645271bf2bc65436f65a726357af4
parenta4b9417b52b9cc52a08aca1c23fe9e2c0081e138 (diff)
downloadbcm5719-llvm-ccb970ee03b583b96ed2984d12ec4545710601b7.tar.gz
bcm5719-llvm-ccb970ee03b583b96ed2984d12ec4545710601b7.zip
Correct a bug in GetArgsAndEnv() for NetBSD
Fix setting envp. llvm-svn: 324481
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_linux.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
index 6c83e8db42a..25ff43a6958 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -568,7 +568,7 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
*envp = pss->ps_envstr;
#elif SANITIZER_NETBSD
*argv = __ps_strings->ps_argvstr;
- *argv = __ps_strings->ps_envstr;
+ *envp = __ps_strings->ps_envstr;
#else
#if !SANITIZER_GO
if (&__libc_stack_end) {
@@ -1898,4 +1898,3 @@ bool GetRandom(void *buffer, uptr length, bool blocking) {
#endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD ||
// SANITIZER_SOLARIS
-
OpenPOWER on IntegriCloud