From 1073d229ae99b8348abe92439084257da5b6fa7e Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 20 Jul 2013 13:15:20 +0000 Subject: [PATCH] Fix a null-dereference introduced by another mis-fix in r9919. [originally from svn r9946] [r9919 == ea301bdd9b892a5e70692f82f5c0b98bd585e775] --- import.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/import.c b/import.c index f6dc2809..bc35a4ab 100644 --- a/import.c +++ b/import.c @@ -1247,11 +1247,15 @@ int sshcom_encrypted(const Filename *filename, char **comment) answer = 1; done: - *comment = dupstr(key ? key->comment : ""); - smemclr(key->keyblob, key->keyblob_size); - sfree(key->keyblob); - smemclr(key, sizeof(*key)); - sfree(key); + if (key) { + *comment = dupstr(key->comment); + smemclr(key->keyblob, key->keyblob_size); + sfree(key->keyblob); + smemclr(key, sizeof(*key)); + sfree(key); + } else { + *comment = dupstr(""); + } return answer; } -- 2.45.2