diff options
| author | des <des@FreeBSD.org> | 2016-01-21 11:54:34 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-21 11:54:34 +0000 |
| commit | 0c80faa259cc48986b7f44190d4775041aaae6ad (patch) | |
| tree | a7acad41e7fbc545b9d7456a0c51253a7dd802f6 /crypto/openssh/mux.c | |
| parent | 65f3eb83cda89352824870422764082e1e79ddc6 (diff) | |
| download | FreeBSD-src-0c80faa259cc48986b7f44190d4775041aaae6ad.zip FreeBSD-src-0c80faa259cc48986b7f44190d4775041aaae6ad.tar.gz | |
Upgrade to OpenSSH 7.1p2.
Diffstat (limited to 'crypto/openssh/mux.c')
| -rw-r--r-- | crypto/openssh/mux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/openssh/mux.c b/crypto/openssh/mux.c index 8ae9cdf..1ab9339 100644 --- a/crypto/openssh/mux.c +++ b/crypto/openssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.53 2015/05/01 04:03:20 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.54 2015/08/19 23:18:26 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -666,6 +666,8 @@ process_mux_open_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r) u_int lport, cport; int i, ret = 0, freefwd = 1; + memset(&fwd, 0, sizeof(fwd)); + /* XXX - lport/cport check redundant */ if (buffer_get_int_ret(&ftype, m) != 0 || (listen_addr = buffer_get_string_ret(m, NULL)) == NULL || @@ -833,6 +835,8 @@ process_mux_close_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r) int i, ret = 0; u_int lport, cport; + memset(&fwd, 0, sizeof(fwd)); + if (buffer_get_int_ret(&ftype, m) != 0 || (listen_addr = buffer_get_string_ret(m, NULL)) == NULL || buffer_get_int_ret(&lport, m) != 0 || |
