summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2015-03-22 21:18:44 +0000
committerian <ian@FreeBSD.org>2015-03-22 21:18:44 +0000
commit7bc5de3287d135b461f58a24b595cdcd49b9cffa (patch)
treebdc9d59718145e19d6112a0ab7371b490e59af6c /sys/kern
parent33a91f27625e2796e469bfacd2480c63f1a0e622 (diff)
downloadFreeBSD-src-7bc5de3287d135b461f58a24b595cdcd49b9cffa.zip
FreeBSD-src-7bc5de3287d135b461f58a24b595cdcd49b9cffa.tar.gz
The sysctls that return process argv and envv return binary data, so clear
the SBUF_INCLUDENUL flag. Pointed out by: tijl@
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index f72269d..505521d 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -1851,6 +1851,7 @@ sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS)
_PHOLD(p);
PROC_UNLOCK(p);
sbuf_new_for_sysctl(&sb, NULL, GET_PS_STRINGS_CHUNK_SZ, req);
+ sbuf_clear_flags(&sb, SBUF_INCLUDENUL);
error = proc_getargv(curthread, p, &sb);
error2 = sbuf_finish(&sb);
PRELE(p);
@@ -1903,6 +1904,7 @@ sysctl_kern_proc_env(SYSCTL_HANDLER_ARGS)
}
sbuf_new_for_sysctl(&sb, NULL, GET_PS_STRINGS_CHUNK_SZ, req);
+ sbuf_clear_flags(&sb, SBUF_INCLUDENUL);
error = proc_getenvv(curthread, p, &sb);
error2 = sbuf_finish(&sb);
PRELE(p);
OpenPOWER on IntegriCloud