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 2012/06/01 01:01:22 

[mux.c]
     fix memory leak when mux socket creation fails; bz#2002 from bert.wesarg
     AT googlemail.com
This commit is contained in:
Damien Miller 2012-06-20 21:52:00 +10:00
parent 7f12157c0a
commit 2e7decfcc0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -24,6 +24,10 @@
[PROTOCOL.mux] [PROTOCOL.mux]
correct types of port numbers (integers, not strings); bz#2004 from correct types of port numbers (integers, not strings); bz#2004 from
bert.wesarg AT googlemail.com bert.wesarg AT googlemail.com
- djm@cvs.openbsd.org 2012/06/01 01:01:22
[mux.c]
fix memory leak when mux socket creation fails; bz#2002 from bert.wesarg
AT googlemail.com
20120519 20120519
- (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch

4
mux.c
View File

@ -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> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -1195,6 +1195,7 @@ muxserver_listen(void)
close(muxserver_sock); close(muxserver_sock);
muxserver_sock = -1; muxserver_sock = -1;
} }
xfree(orig_control_path);
xfree(options.control_path); xfree(options.control_path);
options.control_path = NULL; options.control_path = NULL;
options.control_master = SSHCTL_MASTER_NO; options.control_master = SSHCTL_MASTER_NO;
@ -1216,7 +1217,6 @@ muxserver_listen(void)
} }
error("ControlSocket %s already exists, disabling multiplexing", error("ControlSocket %s already exists, disabling multiplexing",
orig_control_path); orig_control_path);
xfree(orig_control_path);
unlink(options.control_path); unlink(options.control_path);
goto disable_mux_master; goto disable_mux_master;
} }