commit d59ce08811bf94111c2f442184cf7d1257ffae24
author mmcc@openbsd.org <mmcc@openbsd.org> Thu Dec 10 17:08:40 2015 +0000
committer Damien Miller <djm@mindrot.org> Fri Dec 11 13:23:14 2015 +1100
tree 5885ad687f762834250c9c3f5b53b3f1b750c9f1
parent 8e56dd46cb37879c73bce2d6032cf5e7f82d5a71

upstream commit

Remove NULL-checks before free().

ok dtucker@

Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8

ssh.c

diff --git a/ssh.c b/ssh.c
index 38e2b66..37dcdc7 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.430 2015/11/19 08:23:27 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.431 2015/12/10 17:08:40 mmcc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -911,8 +911,7 @@
 			subsystem_flag = 1;
 			break;
 		case 'S':
-			if (options.control_path != NULL)
-				free(options.control_path);
+			free(options.control_path);
 			options.control_path = xstrdup(optarg);
 			break;
 		case 'b':