- deraadt@cvs.openbsd.org 2003/10/07 21:58:28
[sshconnect2.c] set ptr to NULL after free
This commit is contained in:
parent
64dbccc2a5
commit
796448276c
|
@ -2,11 +2,14 @@
|
||||||
- (dtucker) OpenBSD CVS Sync
|
- (dtucker) OpenBSD CVS Sync
|
||||||
- dtucker@cvs.openbsd.org 2003/10/07 01:47:27
|
- dtucker@cvs.openbsd.org 2003/10/07 01:47:27
|
||||||
[sshconnect2.c]
|
[sshconnect2.c]
|
||||||
Don't use logit for banner, since it truncates to MSGBUFSIZ; bz #668 & #707.
|
Don't use logit for banner, since it truncates to MSGBUFSIZ; bz #668 &
|
||||||
ok markus@
|
#707. ok markus@
|
||||||
- djm@cvs.openbsd.org 2003/10/07 07:04:16
|
- djm@cvs.openbsd.org 2003/10/07 07:04:16
|
||||||
[sftp-int.c]
|
[sftp-int.c]
|
||||||
sftp quoting fix from admorten AT umich.edu; ok markus@
|
sftp quoting fix from admorten AT umich.edu; ok markus@
|
||||||
|
- deraadt@cvs.openbsd.org 2003/10/07 21:58:28
|
||||||
|
[sshconnect2.c]
|
||||||
|
set ptr to NULL after free
|
||||||
|
|
||||||
20031007
|
20031007
|
||||||
- (djm) Delete autom4te.cache after autoreconf
|
- (djm) Delete autom4te.cache after autoreconf
|
||||||
|
@ -1302,4 +1305,4 @@
|
||||||
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
||||||
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.3065 2003/10/08 07:34:38 dtucker Exp $
|
$Id: ChangeLog,v 1.3066 2003/10/08 07:37:58 dtucker Exp $
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sshconnect2.c,v 1.125 2003/10/07 01:47:27 dtucker Exp $");
|
RCSID("$OpenBSD: sshconnect2.c,v 1.126 2003/10/07 21:58:28 deraadt Exp $");
|
||||||
|
|
||||||
#include "openbsd-compat/sys-queue.h"
|
#include "openbsd-compat/sys-queue.h"
|
||||||
|
|
||||||
|
@ -358,6 +358,7 @@ void
|
||||||
input_userauth_banner(int type, u_int32_t seq, void *ctxt)
|
input_userauth_banner(int type, u_int32_t seq, void *ctxt)
|
||||||
{
|
{
|
||||||
char *msg, *lang;
|
char *msg, *lang;
|
||||||
|
|
||||||
debug3("input_userauth_banner");
|
debug3("input_userauth_banner");
|
||||||
msg = packet_get_string(NULL);
|
msg = packet_get_string(NULL);
|
||||||
lang = packet_get_string(NULL);
|
lang = packet_get_string(NULL);
|
||||||
|
@ -373,10 +374,14 @@ input_userauth_success(int type, u_int32_t seq, void *ctxt)
|
||||||
Authctxt *authctxt = ctxt;
|
Authctxt *authctxt = ctxt;
|
||||||
if (authctxt == NULL)
|
if (authctxt == NULL)
|
||||||
fatal("input_userauth_success: no authentication context");
|
fatal("input_userauth_success: no authentication context");
|
||||||
if (authctxt->authlist)
|
if (authctxt->authlist) {
|
||||||
xfree(authctxt->authlist);
|
xfree(authctxt->authlist);
|
||||||
if (authctxt->methoddata)
|
authctxt->authlist = NULL;
|
||||||
|
}
|
||||||
|
if (authctxt->methoddata) {
|
||||||
xfree(authctxt->methoddata);
|
xfree(authctxt->methoddata);
|
||||||
|
authctxt->methoddata = NULL;
|
||||||
|
}
|
||||||
authctxt->success = 1; /* break out */
|
authctxt->success = 1; /* break out */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -609,7 +614,7 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt)
|
||||||
|
|
||||||
packet_check_eom();
|
packet_check_eom();
|
||||||
|
|
||||||
status=ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds,
|
status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds,
|
||||||
&recv_tok, &send_tok, NULL);
|
&recv_tok, &send_tok, NULL);
|
||||||
|
|
||||||
xfree(recv_tok.value);
|
xfree(recv_tok.value);
|
||||||
|
|
Loading…
Reference in New Issue