summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-26 13:54:03 +1100
committerDamien Miller <djm@mindrot.org>2006-03-26 13:54:03 +1100
commit5790b5910bfc3de69e0886953f9c09341f3fd951 (patch)
tree0c1820e7c945025da5569c540df82c8904aaa525
parent928b23684a1d94dc2bc1cecc75b0e596eb7a4cb9 (diff)
- djm@cvs.openbsd.org 2006/03/19 07:41:30
[sshconnect2.c] memory leaks detected by Coverity via elad AT netbsd.org; deraadt@ ok
-rw-r--r--ChangeLog6
-rw-r--r--sshconnect2.c7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 19425d86..5a46102e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@
[dh.c readconf.c servconf.c]
potential NULL pointer dereferences detected by Coverity
via elad AT netbsd.org; ok deraadt@
+ - djm@cvs.openbsd.org 2006/03/19 07:41:30
+ [sshconnect2.c]
+ memory leaks detected by Coverity via elad AT netbsd.org;
+ deraadt@ ok
20060325
- OpenBSD CVS Sync
@@ -4287,4 +4291,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4249 2006/03/26 02:53:32 djm Exp $
+$Id: ChangeLog,v 1.4250 2006/03/26 02:54:12 djm Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index b7aa96e3..f8d21489 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -513,8 +513,10 @@ userauth_gssapi(Authctxt *authctxt)
}
}
- if (!ok)
+ if (!ok) {
+ ssh_gssapi_delete_ctx(&gssctxt);
return 0;
+ }
authctxt->methoddata=(void *)gssctxt;
@@ -1330,6 +1332,7 @@ userauth_hostbased(Authctxt *authctxt)
if (p == NULL) {
error("userauth_hostbased: cannot get local ipaddr/name");
key_free(private);
+ xfree(blob);
return 0;
}
len = strlen(p) + 2;
@@ -1368,6 +1371,7 @@ userauth_hostbased(Authctxt *authctxt)
error("key_sign failed");
xfree(chost);
xfree(pkalg);
+ xfree(blob);
return 0;
}
packet_start(SSH2_MSG_USERAUTH_REQUEST);
@@ -1383,6 +1387,7 @@ userauth_hostbased(Authctxt *authctxt)
xfree(signature);
xfree(chost);
xfree(pkalg);
+ xfree(blob);
packet_send();
return 1;