diff options
| author | Alistair Delva <adelva@google.com> | 2020-08-21 00:00:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-08-21 00:00:13 +0000 |
| commit | ed358b3546c776c1c677fd88eb8f716cf6187510 (patch) | |
| tree | 3c6134bcb2cda4b9dccc57b4a8b997a945aab62d /openbsd-compat/bsd-waitpid.c | |
| parent | 22246b08952d746a7cc5a292570636cf4277598f (diff) | |
| parent | 44a1065de8a58c51a021243a28bfa01e87822e4f (diff) | |
Merge changes I934c73d4,I28cdc9a0,I9e734da9,I3c079d86
* changes:
UPSTREAM: depend
UPSTREAM: upstream: avoid possible NULL deref; from Pedro Martelletto
Revert "upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@"
Merge upstream-master into master
Diffstat (limited to 'openbsd-compat/bsd-waitpid.c')
| -rw-r--r-- | openbsd-compat/bsd-waitpid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsd-compat/bsd-waitpid.c b/openbsd-compat/bsd-waitpid.c index 40e6ffaa..113fb1ea 100644 --- a/openbsd-compat/bsd-waitpid.c +++ b/openbsd-compat/bsd-waitpid.c @@ -24,7 +24,7 @@ #include "includes.h" -#ifndef HAVE_WAITPID +#ifndef HAVE_WAITPID #include <errno.h> #include <sys/wait.h> #include "bsd-waitpid.h" @@ -43,11 +43,11 @@ waitpid(int pid, int *stat_loc, int options) /* wait4() wants pid=0 for indiscriminate wait. */ pid = 0; } - wait_pid = wait4(pid, &statusp, options, NULL); + wait_pid = wait4(pid, &statusp, options, NULL); if (stat_loc) - *stat_loc = (int) statusp.w_status; + *stat_loc = (int) statusp.w_status; - return (wait_pid); + return (wait_pid); } #endif /* !HAVE_WAITPID */ |