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

Merge pull request #3593 from ccpp/gateway-http-bugfix

Browse Source 
Bugfix in RDP Gateway HTTP: read/skip full HTTP body
This commit is contained in:
akallabeth 2016-11-16 19:27:55 +01:00 committed by GitHub
commit 15716695fa
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,16 +737,6 @@ HttpResponse* http_response_recv(rdpTls* tls)
response->BodyLength = Stream_GetPosition(s) - payloadOffset;
if (response->BodyLength > 0)
{
response->BodyContent = (BYTE*) malloc(response->BodyLength);
if (!response->BodyContent)
goto out_error;
CopyMemory(response->BodyContent, payload, response->BodyLength);
}
bodyLength = 0; /* expected body length */
if (response->ContentType)
@ -763,6 +753,39 @@ HttpResponse* http_response_recv(rdpTls* tls)
bodyLength = response->BodyLength;
}
// Fetch remaining body!
while (response->BodyLength < bodyLength)
{
if (!Stream_EnsureRemainingCapacity(s, bodyLength - response->BodyLength))
goto out_error;
status = BIO_read(tls->bio, Stream_Pointer(s), bodyLength - response->BodyLength);
if (status <= 0)
{
if (!BIO_should_retry(tls->bio))
goto out_error;
USleep(100);
continue;
}
Stream_Seek(s, status);
response->BodyLength += status;
}
if (response->BodyLength > 0)
{
response->BodyContent = (BYTE*) malloc(response->BodyLength);
if (!response->BodyContent)
goto out_error;
CopyMemory(response->BodyContent, payload, response->BodyLength);
response->BodyLength = bodyLength;
}
if (bodyLength != response->BodyLength)
{
WLog_WARN(TAG, "http_response_recv: %s unexpected body length: actual: %d, expected: %d",