summaryrefslogtreecommitdiff
path: root/usr/src/cmd/halt
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-01-24 16:02:31 +0200
committerToomas Soome <tsoome@me.com>2019-07-12 09:02:09 +0300
commit1940b2a8f27c546bb66a973012e36f32123042ca (patch)
treec28f799d8486d52a9c5adc8e4dc6eee3c1a39931 /usr/src/cmd/halt
parent940f2f5868892c7a40e071319100921b5b859283 (diff)
downloadillumos-joyent-1940b2a8f27c546bb66a973012e36f32123042ca.tar.gz
11345 halt: NULL pointer errors
Reviewed by: Andrew Stormont <andyjstormont@gmail.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/halt')
-rw-r--r--usr/src/cmd/halt/halt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c
index a98360d6c2..edd862ff39 100644
--- a/usr/src/cmd/halt/halt.c
+++ b/usr/src/cmd/halt/halt.c
@@ -1263,7 +1263,7 @@ main(int argc, char *argv[])
int qflag = 0, needlog = 1, nosync = 0;
int fast_reboot = 0;
int prom_reboot = 0;
- uintptr_t mdep = NULL;
+ uintptr_t mdep = 0;
int cmd, fcn, c, aval, r;
const char *usage;
const char *optstring;
@@ -1608,7 +1608,7 @@ main(int argc, char *argv[])
}
if (cmd == A_DUMP && nosync != 0)
- (void) uadmin(A_DUMP, AD_NOSYNC, NULL);
+ (void) uadmin(A_DUMP, AD_NOSYNC, 0);
if (fast_reboot)
fcn = AD_FASTREBOOT;