summaryrefslogtreecommitdiff
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 19425d867..5a46102ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@
30 [dh.c readconf.c servconf.c] 30 [dh.c readconf.c servconf.c]
31 potential NULL pointer dereferences detected by Coverity 31 potential NULL pointer dereferences detected by Coverity
32 via elad AT netbsd.org; ok deraadt@ 32 via elad AT netbsd.org; ok deraadt@
33 - djm@cvs.openbsd.org 2006/03/19 07:41:30
34 [sshconnect2.c]
35 memory leaks detected by Coverity via elad AT netbsd.org;
36 deraadt@ ok
33 37
3420060325 3820060325
35 - OpenBSD CVS Sync 39 - OpenBSD CVS Sync
@@ -4287,4 +4291,4 @@
4287 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4291 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4288 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4292 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4289 4293
4290$Id: ChangeLog,v 1.4249 2006/03/26 02:53:32 djm Exp $ 4294$Id: ChangeLog,v 1.4250 2006/03/26 02:54:12 djm Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index b7aa96e39..f8d21489e 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -513,8 +513,10 @@ userauth_gssapi(Authctxt *authctxt)
513 } 513 }
514 } 514 }
515 515
516 if (!ok) 516 if (!ok) {
517 ssh_gssapi_delete_ctx(&gssctxt);
517 return 0; 518 return 0;
519 }
518 520
519 authctxt->methoddata=(void *)gssctxt; 521 authctxt->methoddata=(void *)gssctxt;
520 522
@@ -1330,6 +1332,7 @@ userauth_hostbased(Authctxt *authctxt)
1330 if (p == NULL) { 1332 if (p == NULL) {
1331 error("userauth_hostbased: cannot get local ipaddr/name"); 1333 error("userauth_hostbased: cannot get local ipaddr/name");
1332 key_free(private); 1334 key_free(private);
1335 xfree(blob);
1333 return 0; 1336 return 0;
1334 } 1337 }
1335 len = strlen(p) + 2; 1338 len = strlen(p) + 2;
@@ -1368,6 +1371,7 @@ userauth_hostbased(Authctxt *authctxt)
1368 error("key_sign failed"); 1371 error("key_sign failed");
1369 xfree(chost); 1372 xfree(chost);
1370 xfree(pkalg); 1373 xfree(pkalg);
1374 xfree(blob);
1371 return 0; 1375 return 0;
1372 } 1376 }
1373 packet_start(SSH2_MSG_USERAUTH_REQUEST); 1377 packet_start(SSH2_MSG_USERAUTH_REQUEST);
@@ -1383,6 +1387,7 @@ userauth_hostbased(Authctxt *authctxt)
1383 xfree(signature); 1387 xfree(signature);
1384 xfree(chost); 1388 xfree(chost);
1385 xfree(pkalg); 1389 xfree(pkalg);
1390 xfree(blob);
1386 1391
1387 packet_send(); 1392 packet_send();
1388 return 1; 1393 return 1;