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

libfreerdp-core: fix for mppc decompression without fastpath and multi data PDUs in one packet

Browse Source
This commit is contained in:
Jay Sorg 2012-03-08 17:47:01 -08:00
parent 98514568d6
commit 131c19fea6
2 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libfreerdp-core/rdp.c
View File

@ -492,6 +492,7 @@ boolean rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s)
printf("decompress_rdp() failed\n");
return false;
}
stream_seek(s, compressed_len - 18);
}
#ifdef WITH_DEBUG_RDP
@ -588,7 +589,10 @@ boolean rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s)
}
if (comp_stream != s)
xfree(comp_stream);
{
stream_detach(comp_stream);
stream_free(comp_stream);
}
return true;
}
@ -695,6 +699,7 @@ static boolean rdp_recv_tpkt_pdu(rdpRdp* rdp, STREAM* s)
uint16 pduSource;
uint16 channelId;
uint16 securityFlags;
uint8* nextp;
if (!rdp_read_header(rdp, s, &length, &channelId))
{
@ -731,29 +736,38 @@ static boolean rdp_recv_tpkt_pdu(rdpRdp* rdp, STREAM* s)
}
else
{
rdp_read_share_control_header(s, &pduLength, &pduType, &pduSource);
rdp->settings->pdu_source = pduSource;
switch (pduType)
while (stream_get_left(s) > 3)
{
case PDU_TYPE_DATA:
if (!rdp_recv_data_pdu(rdp, s))
return false;
break;
stream_get_mark(s, nextp);
rdp_read_share_control_header(s, &pduLength, &pduType, &pduSource);
nextp += pduLength;
case PDU_TYPE_DEACTIVATE_ALL:
if (!rdp_recv_deactivate_all(rdp, s))
return false;
break;
rdp->settings->pdu_source = pduSource;
case PDU_TYPE_SERVER_REDIRECTION:
rdp_recv_enhanced_security_redirection_packet(rdp, s);
break;
switch (pduType)
{
case PDU_TYPE_DATA:
if (!rdp_recv_data_pdu(rdp, s))
{
printf("rdp_recv_data_pdu failed\n");
return false;
}
break;
default:
printf("incorrect PDU type: 0x%04X\n", pduType);
break;
case PDU_TYPE_DEACTIVATE_ALL:
if (!rdp_recv_deactivate_all(rdp, s))
return false;
break;
case PDU_TYPE_SERVER_REDIRECTION:
rdp_recv_enhanced_security_redirection_packet(rdp, s);
break;
default:
printf("incorrect PDU type: 0x%04X\n", pduType);
break;
}
stream_set_mark(s, nextp);
}
}

15
libfreerdp-core/update.c
View File

@ -285,21 +285,6 @@ boolean update_recv(rdpUpdate* update, STREAM* s)
IFCALL(update->EndPaint, context);
if (stream_get_left(s) > RDP_SHARE_DATA_HEADER_LENGTH)
{
uint16 pduType;
uint16 length;
uint16 source;
rdp_read_share_control_header(s, &length, &pduType, &source);
if (pduType != PDU_TYPE_DATA)
return false;
if (!rdp_recv_data_pdu(update->context->rdp, s))
return false;
}
return true;
}