10305 print: NULL pointer errors

Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Gergő Mihály Doma <domag02@gmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
illumos · Feb 4, 2019 · 5243e33 · 5243e33
1 parent 4f6502b
commit 5243e33
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/usr/src/cmd/print/bsd-sysv-commands/cancel.c b/usr/src/cmd/print/bsd-sysv-commands/cancel.c
@@ -200,7 +200,7 @@ main(int ac, char *av[])
 				/* Remove first job from printer */
 
 				status = papiPrinterListJobs(svc, printer,
-				    NULL, NULL, 0, &jobs);
+				    NULL, 0, 0, &jobs);
 
 				if (status != PAPI_OK) {
 					fprintf(stderr, gettext(

diff --git a/usr/src/cmd/print/bsd-sysv-commands/in.lpd.c b/usr/src/cmd/print/bsd-sysv-commands/in.lpd.c
@@ -130,7 +130,7 @@ static papi_attribute_t **
 parse_cf(papi_service_t svc, char *cf, char **files)
 {
 	papi_attribute_t **list = NULL;
-	char	previous = NULL;
+	char	previous = '\0';
 	char	*entry;
 	int	copies_set = 0;
 	int	copies = 0;
@@ -509,7 +509,7 @@ berkeley_receive_files(papi_service_t svc, FILE *ifp, FILE *ofp, char *printer)
 		case 0x02: {	/* Receive control file */
 			if (((cf = strchr(buf, ' ')) != NULL) &&
 			    (strlen(cf) > 4)) {
-				while ((*cf != NULL) && (isdigit(*cf) == 0))
+				while ((*cf != '\0') && (isdigit(*cf) == 0))
 					cf++;
 				rid = atoi(cf);
 			}

diff --git a/usr/src/cmd/print/conv_fix/conv_fix.c b/usr/src/cmd/print/conv_fix/conv_fix.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -64,7 +62,7 @@ _file_getline(FILE *fp)
 			continue;
 		} else {
 			if ((*tmp == '#') || (*tmp == '\n')) {
-				*tmp = NULL;
+				*tmp = '\0';
 				break;
 			}
 

diff --git a/usr/src/cmd/print/lpset/lpset.c b/usr/src/cmd/print/lpset/lpset.c
@@ -273,18 +273,18 @@ main(int ac, char *av[])
 
 			key = *(changes++);
 
-			for (p = key; ((p != NULL) && (*p != NULL)); p++)
+			for (p = key; ((p != NULL) && (*p != '\0')); p++)
 				if (*p == '=') {
-					*p = NULL;
+					*p = '\0';
 					value = ++p;
 					break;
 				} else if (*p == '\\')
 					p++;
 
-			if ((value != NULL) && (*value == NULL))
+			if ((value != NULL) && (*value == '\0'))
 				value = NULL;
 
-			if ((key != NULL) && (key[0] != NULL)) {
+			if ((key != NULL) && (key[0] != '\0')) {
 				if ((value == NULL) &&
 				    (ns_get_value(key, printer_obj) == NULL) &&
 				    (has_equals == 0)) {