summaryrefslogtreecommitdiff
path: root/bin/ksh/var.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2015-09-22 21:50:41 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2015-09-22 21:50:41 +0000
commit6e60e48fdd8022a4da2ecad0a4ec8d65e4110a78 (patch)
tree1e58923afa2769e6618902b49259071569574487 /bin/ksh/var.c
parentdac08daa66a37497220033a0013fe7c86ebe3cee (diff)
Make errorf() and bi_errorf() handle a NULL argument.
From Michael McConville; OK nicm@
Diffstat (limited to 'bin/ksh/var.c')
-rw-r--r--bin/ksh/var.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ksh/var.c b/bin/ksh/var.c
index a35c9d96873..f0ee491444d 100644
--- a/bin/ksh/var.c
+++ b/bin/ksh/var.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: var.c,v 1.49 2015/09/18 07:28:24 nicm Exp $ */
+/* $OpenBSD: var.c,v 1.50 2015/09/22 21:50:40 millert Exp $ */
#include "sh.h"
#include <time.h>
@@ -354,7 +354,7 @@ setstr(struct tbl *vq, const char *s, int error_ok)
if ((vq->flag & RDONLY) && !no_ro_check) {
warningf(true, "%s: is read only", vq->name);
if (!error_ok)
- errorf(null);
+ errorf(NULL);
return 0;
}
if (!(vq->flag&INTEGER)) { /* string dest */
@@ -704,7 +704,7 @@ typeset(const char *var, int set, int clr, int field, int base)
}
}
if (!ok)
- errorf(null);
+ errorf(NULL);
}
if (val != NULL) {