summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-04-16 15:54:01 +1000
committerDamien Miller <djm@mindrot.org>2010-04-16 15:54:01 +1000
commit601a23c02cb1612e9596f4ce7bfa261525363c5d (patch)
treeb82a41af442ba248eb2e8701074c7c91a44c2b52 /mux.c
parent88680654ad2378ebb4fa7aa326552aec760132ed (diff)
- djm@cvs.openbsd.org 2010/04/10 05:48:16
[mux.c] fix NULL dereference; from matthew.haub AT alumni.adelaide.edu.au
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mux.c b/mux.c
index 825fb7a9a..b0d4abe19 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.14 2010/01/30 02:54:53 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.15 2010/04/10 05:48:16 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -206,7 +206,7 @@ mux_master_control_cleanup_cb(int cid, void *unused)
206 fatal("%s: channel_by_id(%i) == NULL", __func__, cid); 206 fatal("%s: channel_by_id(%i) == NULL", __func__, cid);
207 if (c->remote_id != -1) { 207 if (c->remote_id != -1) {
208 if ((sc = channel_by_id(c->remote_id)) == NULL) 208 if ((sc = channel_by_id(c->remote_id)) == NULL)
209 debug2("%s: channel %d n session channel %d", 209 fatal("%s: channel %d missing session channel %d",
210 __func__, c->self, c->remote_id); 210 __func__, c->self, c->remote_id);
211 c->remote_id = -1; 211 c->remote_id = -1;
212 sc->ctl_chan = -1; 212 sc->ctl_chan = -1;