tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/04/10 05:48:16 

[mux.c]
     fix NULL dereference; from matthew.haub AT alumni.adelaide.edu.au
This commit is contained in:
Damien Miller 2010-04-16 15:54:01 +10:00
parent 88680654ad
commit 601a23c02c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -29,6 +29,9 @@
show the key type that we are offering in debug(), helps distinguish show the key type that we are offering in debug(), helps distinguish
between certs and plain keys as the path to the private key is usually between certs and plain keys as the path to the private key is usually
the same. the same.
- djm@cvs.openbsd.org 2010/04/10 05:48:16
[mux.c]
fix NULL dereference; from matthew.haub AT alumni.adelaide.edu.au
20100410 20100410
- (dtucker) [configure.ac] Put the check for the existence of getaddrinfo - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo

4
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.14 2010/01/30 02:54:53 djm Exp $ */ /* $OpenBSD: mux.c,v 1.15 2010/04/10 05:48:16 djm Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -206,7 +206,7 @@ mux_master_control_cleanup_cb(int cid, void *unused)
fatal("%s: channel_by_id(%i) == NULL", __func__, cid); fatal("%s: channel_by_id(%i) == NULL", __func__, cid);
if (c->remote_id != -1) { if (c->remote_id != -1) {
if ((sc = channel_by_id(c->remote_id)) == NULL) if ((sc = channel_by_id(c->remote_id)) == NULL)
debug2("%s: channel %d n session channel %d", fatal("%s: channel %d missing session channel %d",
__func__, c->self, c->remote_id); __func__, c->self, c->remote_id);
c->remote_id = -1; c->remote_id = -1;
sc->ctl_chan = -1; sc->ctl_chan = -1;