diff options
| author |   djm <djm@openbsd.org> | 2012-06-01 01:01:22 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2012-06-01 01:01:22 +0000 |
| commit | 9fa49d12e0a7e203c9dbb1ed02834c13c162ccc0 (patch) | |
| tree | 7767c249ca1af733b8d84bfc36bc330593b1e34a | |
| parent | don't delete .* on cleanup due to unintended env expansion; pointed out in (diff) | |
| download | wireguard-openbsd-9fa49d12e0a7e203c9dbb1ed02834c13c162ccc0.tar.xz wireguard-openbsd-9fa49d12e0a7e203c9dbb1ed02834c13c162ccc0.zip | |
fix memory leak when mux socket creation fails; bz#2002 from bert.wesarg
AT googlemail.com
| -rw-r--r-- | usr.bin/ssh/mux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index 0e78800a2d9..b8f33d72c6d 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.34 2012/01/07 21:11:36 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.35 2012/06/01 01:01:22 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -1177,6 +1177,7 @@ muxserver_listen(void) close(muxserver_sock); muxserver_sock = -1; } + xfree(orig_control_path); xfree(options.control_path); options.control_path = NULL; options.control_master = SSHCTL_MASTER_NO; @@ -1198,7 +1199,6 @@ muxserver_listen(void) } error("ControlSocket %s already exists, disabling multiplexing", orig_control_path); - xfree(orig_control_path); unlink(options.control_path); goto disable_mux_master; } |