simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2014-10-28 18:41:52

commit 32adc1a79d0de4219c877f6be80b46984319c1c9
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=32adc1a79d0de4219c877f6be80b46984319c1c9;hp=bbfd5f4a7c43a80e207a53f0f121a90ff7bbe057
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Oct 28 18:39:55 2014 +0000

    Fix two double-frees in ssh2_load_userkey().
    
    We should NULL out mac after freeing it, so that the cleanup code
    doesn't try to free it again; also if the final key creation fails, we
    should avoid freeing ret->comment when we're going to go to that same
    cleanup code which will free 'comment' which contains the same pointer.
    
    Thanks to Christopher Staite for pointing these out.

 sshpubk.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)