merge of '691c56da3db2685f58ea53540a73c1b79e7df9cd'

     and 'e0efd546c3cdb2828971e41af2afe43e850c641d'

--HG--
extra : convert_revision : 3d683afab1940779612505721e67bd9c98df057e

1 files changed, 2 insertions, 3 deletions

diff --git a/cli-runopts.c b/cli-runopts.c
index 732d7a4..1a077b9 100644
--- a/cli-runopts.c
+++ b/cli-runopts.c
@@ -363,7 +363,8 @@ static void addforward(char* origstr, struct TCPFwdList** fwdlist) {
 
 	TRACE(("enter addforward"))
 
-	/* We probably don't want to be editing argvs */
+	/* We need to split the original argument up. This var
+	   is never free()d. */ 
 	str = m_strdup(origstr);
 
 	listenport = str;
@@ -415,8 +416,6 @@ static void addforward(char* origstr, struct TCPFwdList** fwdlist) {
 	newfwd->next = *fwdlist;
 	*fwdlist = newfwd;
 
-	m_free(str);
-
 	TRACE(("leave addforward: done"))
 	return;