summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/os/exec.c
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-01-18 10:38:01 +0200
committerToomas Soome <tsoome@me.com>2019-02-20 22:08:00 +0200
commit7e12ceb3ebc63aeb71e91b496032ca22ca55f660 (patch)
treea720628c8eef67512aba873033fc352faac80c8d /usr/src/uts/common/os/exec.c
parent7e897d1fc847b22dc338da9a5a59dae0cd8765de (diff)
downloadillumos-gate-7e12ceb3ebc63aeb71e91b496032ca22ca55f660.tar.gz
10376 uts: NULL pointer issues in genunix
Reviewed by: Andy Fiddaman <andy@omniosce.org> Reviewed by: Andy Stormont <astormont@racktopsystems.com> Reviewed by: John Levon <john.levon@joyent.com> Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/uts/common/os/exec.c')
-rw-r--r--usr/src/uts/common/os/exec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/os/exec.c b/usr/src/uts/common/os/exec.c
index 53c552f135..f51e2c5ca1 100644
--- a/usr/src/uts/common/os/exec.c
+++ b/usr/src/uts/common/os/exec.c
@@ -356,7 +356,7 @@ exec_common(const char *fname, const char **argp, const char **envp,
*/
up->u_acflag &= ~AFORK;
bcopy(exec_file, up->u_comm, MAXCOMLEN+1);
- curthread->t_predcache = NULL;
+ curthread->t_predcache = 0;
/*
* Clear contract template state
@@ -1664,7 +1664,7 @@ stk_copyin(execa_t *uap, uarg_t *args, intpdata_t *intp, void **auxvpp)
if (args->scrubenv && strncmp(tmp, "LD_", 3) == 0) {
/* Undo the copied string */
args->stk_strp = tmp;
- *(args->stk_offp++) = NULL;
+ *(args->stk_offp++) = 0;
}
envp += ptrsize;
}