From ffca9b6bef40a4b4cb6c2739812326c6234f7984 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Sun, 20 Jan 2019 23:02:21 +0200 Subject: 11090 libconv: NULL pointer errors Reviewed by: Andrew Stormont Approved by: Dan McDonald --- usr/src/cmd/sgs/libconv/common/corenote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'usr/src/cmd/sgs') diff --git a/usr/src/cmd/sgs/libconv/common/corenote.c b/usr/src/cmd/sgs/libconv/common/corenote.c index dc9b8022f3..bf6d109916 100644 --- a/usr/src/cmd/sgs/libconv/common/corenote.c +++ b/usr/src/cmd/sgs/libconv/common/corenote.c @@ -112,7 +112,7 @@ conv_cnote_auxv_type(Word type, Conv_fmt_flags_t fmt_flags, MSG_AUXV_AT_SUN_EMULATOR, MSG_AUXV_AT_SUN_BRANDNAME, MSG_AUXV_AT_SUN_BRAND_AUX1, MSG_AUXV_AT_SUN_BRAND_AUX2, MSG_AUXV_AT_SUN_BRAND_AUX3, MSG_AUXV_AT_SUN_HWCAP2, - NULL, NULL, + 0, 0, MSG_AUXV_AT_SUN_COMMPAGE, MSG_AUXV_AT_SUN_FPTYPE, MSG_AUXV_AT_SUN_FPSIZE }; @@ -2478,7 +2478,7 @@ conv_cnote_fileflags(uint32_t fileflags, Conv_fmt_flags_t fmt_flags, { 0x2000, MSG_PR_O_LARGEFILE }, { 0x20000, MSG_PR_O_NOFOLLOW }, { 0x40000, MSG_PR_O_NOLINKS }, - { 0, NULL }, + { 0, 0 }, }; arg.oflags = arg.rflags = fileflags; @@ -2530,7 +2530,7 @@ conv_cnote_filemode(uint32_t mode, Conv_fmt_flags_t fmt_flags, { 0004, MSG_S_IROTH }, { 0002, MSG_S_IWOTH }, { 0001, MSG_S_IXOTH }, - { 0, NULL }, + { 0, 0 }, }; arg.oflags = arg.rflags = mode & ~(0xf000); @@ -2569,7 +2569,7 @@ conv_cnote_filemode(uint32_t mode, Conv_fmt_flags_t fmt_flags, s = MSG_S_IFPORT; break; default: - s = NULL; + s = 0; break; } -- cgit v1.2.3