Skip to content
Snippets Groups Projects
Commit 331fc532 authored by rswindell's avatar rswindell
Browse files

Fixed socket leak.

parent fa5090a3
No related branches found
No related tags found
No related merge requests found
...@@ -816,6 +816,9 @@ static void filexfer(SOCKADDR_IN* addr, SOCKET ctrl_sock, SOCKET pasv_sock, SOCK ...@@ -816,6 +816,9 @@ static void filexfer(SOCKADDR_IN* addr, SOCKET ctrl_sock, SOCKET pasv_sock, SOCK
} }
*inprogress=TRUE; *inprogress=TRUE;
if(*data_sock!=INVALID_SOCKET)
close_socket(data_sock,__LINE__);
if(pasv_sock==INVALID_SOCKET) { /* !PASV */ if(pasv_sock==INVALID_SOCKET) { /* !PASV */
if((*data_sock=socket(AF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) { if((*data_sock=socket(AF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) {
...@@ -846,6 +849,7 @@ static void filexfer(SOCKADDR_IN* addr, SOCKET ctrl_sock, SOCKET pasv_sock, SOCK ...@@ -846,6 +849,7 @@ static void filexfer(SOCKADDR_IN* addr, SOCKET ctrl_sock, SOCKET pasv_sock, SOCK
if(tmpfile) if(tmpfile)
remove(filename); remove(filename);
*inprogress=FALSE; *inprogress=FALSE;
close_socket(data_sock,__LINE__);
return; return;
} }
...@@ -858,6 +862,7 @@ static void filexfer(SOCKADDR_IN* addr, SOCKET ctrl_sock, SOCKET pasv_sock, SOCK ...@@ -858,6 +862,7 @@ static void filexfer(SOCKADDR_IN* addr, SOCKET ctrl_sock, SOCKET pasv_sock, SOCK
if(tmpfile) if(tmpfile)
remove(filename); remove(filename);
*inprogress=FALSE; *inprogress=FALSE;
close_socket(data_sock,__LINE__);
return; return;
} }
if(startup->options&FTP_OPT_DEBUG_DATA) if(startup->options&FTP_OPT_DEBUG_DATA)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment