diff options
| author | Sverker Eriksson <[email protected]> | 2018-07-06 20:12:28 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-07-10 14:10:25 +0200 |
| commit | 7603a4fb82f72a72045eed26dd55de3067cfe344 (patch) | |
| tree | 5dbbd3aa5e0e97a2484ad125508e80d33561c3da | |
| parent | 4100c0cb4d391693fdb08d8565c937bb399fda3a (diff) | |
| download | otp-7603a4fb82f72a72045eed26dd55de3067cfe344.tar.gz otp-7603a4fb82f72a72045eed26dd55de3067cfe344.tar.bz2 otp-7603a4fb82f72a72045eed26dd55de3067cfe344.zip | |
erts: Fix buggy calls to erts_sys_explicit_8bit_getenv
Two of them only affect valgrind builds
and the one for ERL_CRASH_DUMP_NICE seems benign.
Return value changed in c2d70945dce9cb09d5d7120d6e9ddf7faac8d230
old -> new
-1 -> 0 not found
0 -> 1 found ok
1 -> -1 found but too big
| -rw-r--r-- | erts/emulator/beam/dist.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 70474898b2..db35137e92 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -1207,7 +1207,7 @@ erts_dsig_send_group_leader(ErtsDSigData *dsdp, Eterm leader, Eterm remote) # define PURIFY_MSG(msg) \ do { \ char buf__[1]; size_t bufsz__ = sizeof(buf__); \ - if (erts_sys_explicit_8bit_getenv("VALGRIND_LOG_XML", buf__, &bufsz__) >= 0) { \ + if (erts_sys_explicit_8bit_getenv("VALGRIND_LOG_XML", buf__, &bufsz__) != 0) { \ VALGRIND_PRINTF_XML("<erlang_error_log>" \ "%s, line %d: %s</erlang_error_log>\n", \ __FILE__, __LINE__, msg); \ diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 5789fa8e71..39442e52c6 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -2098,7 +2098,7 @@ static int check_if_xml(void) { char buf[1]; size_t bufsz = sizeof(buf); - return erts_sys_explicit_8bit_getenv("VALGRIND_LOG_XML", buf, &bufsz) >= 0; + return erts_sys_explicit_8bit_getenv("VALGRIND_LOG_XML", buf, &bufsz) != 0; } #else #define check_if_xml() 0 diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 189ca083d7..36579ffdb4 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -452,9 +452,9 @@ prepare_crash_dump(int secs) envsz = sizeof(env); i = erts_sys_explicit_8bit_getenv("ERL_CRASH_DUMP_NICE", env, &envsz); - if (i >= 0) { + if (i != 0) { int nice_val; - nice_val = i != 1 ? 0 : atoi(env); + nice_val = (i != 1) ? 0 : atoi(env); if (nice_val > 39) { nice_val = 39; } |