merge of 'b1dd3b94e60a07a176dba2b035ac79968595990a'

and 'bcb33fce2fad01a7626598209d43af3571bd86f0'

--HG--
extra : convert_revision : 691c56da3db2685f58ea53540a73c1b79e7df9cd
This commit is contained in:
Matt Johnston
2007-02-04 10:32:59 +00:00
7 changed files with 24 additions and 18 deletions

View File

@@ -373,8 +373,7 @@ static void addforward(char* origstr, struct TCPFwdList** fwdlist) {
TRACE(("connectaddr == NULL"))
goto fail;
}
connectaddr[0] = '\0';
*connectaddr = '\0';
connectaddr++;
connectport = strchr(connectaddr, ':');
@@ -382,8 +381,7 @@ static void addforward(char* origstr, struct TCPFwdList** fwdlist) {
TRACE(("connectport == NULL"))
goto fail;
}
connectport[0] = '\0';
*connectport = '\0';
connectport++;
newfwd = (struct TCPFwdList*)m_malloc(sizeof(struct TCPFwdList));
@@ -417,6 +415,8 @@ static void addforward(char* origstr, struct TCPFwdList** fwdlist) {
newfwd->next = *fwdlist;
*fwdlist = newfwd;
m_free(str);
TRACE(("leave addforward: done"))
return;