tests: Fix pointer arithmetic in torture_pki_*_publickey_base64

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

tests/unittests/torture_hashes.c

@@ -20,15 +20,19 @@ static int setup_rsa_key(void **state)
     assert_true(b64_key != NULL);
 
     q = p = b64_key;
-    while (*p != ' ') p++;
+    while (p != NULL && *p != '\0' && *p != ' ') p++;
-    *p = '\0';
+    if (p != NULL) {
+        *p = '\0';
+    }
 
     type = ssh_key_type_from_name(q);
     assert_true(type == SSH_KEYTYPE_RSA);
 
     q = ++p;
-    while (*p != ' ') p++;
+    while (p != NULL && *p != '\0' && *p != ' ') p++;
-    *p = '\0';
+    if (p != NULL) {
+        *p = '\0';
+    }
 
     rc = ssh_pki_import_pubkey_base64(q, type, &key);
     assert_true(rc == 0);

tests/unittests/torture_pki_ecdsa.c

@@ -199,15 +199,19 @@ static void torture_pki_ecdsa_publickey_base64(void **state)
     assert_true(key_buf != NULL);
 
     q = p = key_buf;
-    while (*p != ' ') p++;
+    while (p != NULL && *p != '\0' && *p != ' ') p++;
-    *p = '\0';
+    if (p != NULL) {
+        *p = '\0';
+    }
 
     type = ssh_key_type_from_name(q);
     assert_true(type == SSH_KEYTYPE_ECDSA);
 
     q = ++p;
-    while (*p != ' ') p++;
+    while (p != NULL && *p != '\0' && *p != ' ') p++;
-    *p = '\0';
+    if (p != NULL) {
+        *p = '\0';
+    }
 
     rc = ssh_pki_import_pubkey_base64(q, type, &key);
     assert_true(rc == 0);

tests/unittests/torture_pki_ed25519.c

@@ -202,15 +202,19 @@ static void torture_pki_ed25519_publickey_base64(void **state)
     assert_true(key_buf != NULL);
 
     q = p = key_buf;
-    while (*p != ' ') p++;
+    while (p != NULL && *p != '\0' && *p != ' ') p++;
-    *p = '\0';
+    if (p != NULL) {
+        *p = '\0';
+    }
 
     type = ssh_key_type_from_name(q);
     assert_true(type == SSH_KEYTYPE_ED25519);
 
     q = ++p;
-    while (*p != ' ') p++;
+    while (p != NULL && *p != '\0' && *p != ' ') p++;
-    *p = '\0';
+    if (p != NULL) {
+        *p = '\0';
+    }
 
     rc = ssh_pki_import_pubkey_base64(q, type, &key);
     assert_true(rc == 0);

tests/unittests/torture_pki_rsa.c

@@ -277,15 +277,19 @@ static void torture_pki_rsa_publickey_base64(void **state)
     assert_true(key_buf != NULL);
 
     q = p = key_buf;
-    while (*p != ' ') p++;
+    while (p != NULL && *p != '\0' && *p != ' ') p++;
-    *p = '\0';
+    if (p != NULL) {
+        *p = '\0';
+    }
 
     type = ssh_key_type_from_name(q);
     assert_true(type == SSH_KEYTYPE_RSA);
 
     q = ++p;
-    while (*p != ' ') p++;
+    while (p != NULL && *p != '\0' && *p != ' ') p++;
-    *p = '\0';
+    if (p != NULL) {
+        *p = '\0';
+    }
 
     rc = ssh_pki_import_pubkey_base64(q, type, &key);
     assert_true(rc == 0);