From a3bcb0a944eb29287fc4eae14f319a858585ad2c Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Dec 16 2010 19:13:33 +0000
Subject: - don't deref the possibly-null pointer if we don't need to (D10069)


---

diff --git a/src/certsave-n.c b/src/certsave-n.c
index 4d35225..970e2cc 100644
--- a/src/certsave-n.c
+++ b/src/certsave-n.c
@@ -93,7 +93,7 @@ cm_certsave_n_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry,
 				}
 				q = strstr(p, "-----END");
 			}
-			if ((*p == '\0') || (q == NULL)) {
+			if ((q == NULL) || (*p == '\0')) {
 				cm_log(1, "Unable to parse certificate.\n");
 				PORT_FreeArena(arena, PR_TRUE);
 				if (NSS_Shutdown() != SECSuccess) {
diff --git a/src/submit-sn.c b/src/submit-sn.c
index 9552fad..ba32d80 100644
--- a/src/submit-sn.c
+++ b/src/submit-sn.c
@@ -105,7 +105,7 @@ cm_submit_sn_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry,
 		}
 		q = strstr(p, "-----END");
 	}
-	if ((*p == '\0') || (q == NULL)) {
+	if ((q == NULL) || (*p == '\0')) {
 		cm_log(1, "Unable to parse CSR.\n");
 		_exit(1);
 	}