aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2018-06-29 09:22:26 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-06-29 17:12:46 +0200
commita1847660a3420b2a099bbb4aef97a13497a53395 (patch)
tree8e85198533ebb32ce29a197b7c54e2bb6d696f97
parente2b48dc662d3434a66525981fd6dab8eb72e9495 (diff)
downloadlibssh-a1847660a3420b2a099bbb4aef97a13497a53395.tar.gz
libssh-a1847660a3420b2a099bbb4aef97a13497a53395.tar.xz
libssh-a1847660a3420b2a099bbb4aef97a13497a53395.zip
pki: Fix random memory corruption
Fixes T78 Signed-off-by: Andreas Schneider <asn@cryptomilk.org> (cherry picked from commit 1444ae5add315df23a20db48474b1e357b0385e0)
-rw-r--r--src/pki.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pki.c b/src/pki.c
index 49e10b65..e3a62da7 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -999,7 +999,7 @@ int ssh_pki_import_pubkey_file(const char *filename, ssh_key *pkey)
key_buf[size] = '\0';
q = p = key_buf;
- while (!isspace((int)*p)) p++;
+ while (*p != '\0' && !isspace((int)*p)) p++;
*p = '\0';
type = ssh_key_type_from_name(q);
@@ -1008,7 +1008,7 @@ int ssh_pki_import_pubkey_file(const char *filename, ssh_key *pkey)
return SSH_ERROR;
}
q = ++p;
- while (!isspace((int)*p)) p++;
+ while (*p != '\0' && !isspace((int)*p)) p++;
*p = '\0';
rc = ssh_pki_import_pubkey_base64(q, type, pkey);