diff options
| author |   djm <djm@openbsd.org> | 2015-08-19 23:18:26 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-08-19 23:18:26 +0000 |
| commit | 2b77a72d7a36e721db77db2087c6be3c7307a35b (patch) | |
| tree | 6179c6a6fad4bce45364833b5b330e2b864fa644 | |
| parent | fixed unlink([uninitialised memory]) reported by Mateusz Kocielski; (diff) | |
| download | wireguard-openbsd-2b77a72d7a36e721db77db2087c6be3c7307a35b.tar.xz wireguard-openbsd-2b77a72d7a36e721db77db2087c6be3c7307a35b.zip | |
fix free() of uninitialised pointer reported by Mateusz Kocielski;
ok markus@
| -rw-r--r-- | usr.bin/ssh/mux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index 961f7246afe..758956375a1 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/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> * @@ -652,6 +652,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 || @@ -819,6 +821,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 || |