mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeRDP/FreeRDP

Browse Source
This commit is contained in:
Marc-André Moreau 2015-02-11 10:05:33 -05:00
commit 94494511cc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp/core/gateway/http.c
View File

@ -623,7 +623,7 @@ HttpResponse* http_response_recv(rdpTls* tls)
}
#ifdef HAVE_VALGRIND_MEMCHECK_H
VALGRIND_MAKE_MEM_DEFINED(p, status);
VALGRIND_MAKE_MEM_DEFINED(Stream_Pointer(s), status);
#endif
Stream_Seek(s, status);

7
libfreerdp/core/transport.c
View File

@ -115,8 +115,10 @@ BOOL transport_disconnect(rdpTransport* transport)
transport->tsg = NULL;
}
if (transport->TcpOut != transport->TcpIn)
if (transport->TcpOut && (transport->TcpOut != transport->TcpIn)) {
freerdp_tcp_disconnect(transport->TcpOut);
freerdp_tcp_free(transport->TcpOut);
}
transport->TcpOut = NULL;
@ -125,6 +127,9 @@ BOOL transport_disconnect(rdpTransport* transport)
tls_free(transport->TsgTls);
transport->TsgTls = NULL;
}
freerdp_tcp_disconnect(transport->TcpIn);
transport->layer = TRANSPORT_LAYER_TCP;
return status;