shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 02:38:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

auth: Fix possible NULL pointer dereference

Browse Source 
explicit_bzero() doesn't handle NULL.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 8f1e995cec)
This commit is contained in:
Andreas Schneider
2018-08-24 15:49:16 +02:00
parent 0bab6013d0
commit d2989f28db
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/auth.c
View File

@@ -1228,7 +1228,9 @@ void ssh_kbdint_free(ssh_kbdint kbd) {
n = kbd->nprompts; n = kbd->nprompts;
if (kbd->prompts) { if (kbd->prompts) {
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
explicit_bzero(kbd->prompts[i], strlen(kbd->prompts[i])); if (kbd->prompts[i] != NULL) {
explicit_bzero(kbd->prompts[i], strlen(kbd->prompts[i]));
}
SAFE_FREE(kbd->prompts[i]); SAFE_FREE(kbd->prompts[i]);
} }
SAFE_FREE(kbd->prompts); SAFE_FREE(kbd->prompts);
@@ -1237,7 +1239,9 @@ void ssh_kbdint_free(ssh_kbdint kbd) {
n = kbd->nanswers; n = kbd->nanswers;
if (kbd->answers) { if (kbd->answers) {
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
explicit_bzero(kbd->answers[i], strlen(kbd->answers[i])); if (kbd->answers[i] != NULL) {
explicit_bzero(kbd->answers[i], strlen(kbd->answers[i]));
}
SAFE_FREE(kbd->answers[i]); SAFE_FREE(kbd->answers[i]);
} }
SAFE_FREE(kbd->answers); SAFE_FREE(kbd->answers);