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

Unify stream positioning on fastpath updates

Browse Source
This commit is contained in:
Armin Novak 2022-04-05 16:38:10 +02:00 committed by akallabeth
parent 974c700977
commit d49f744526
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libfreerdp/core/fastpath.c
View File

@ -342,6 +342,9 @@ static int fastpath_recv_update(rdpFastPath* fastpath, BYTE updateCode, wStream*
if (!fastpath || !fastpath->rdp || !s) if (!fastpath || !fastpath->rdp || !s)
return -1; return -1;
Stream_SealLength(s);
Stream_SetPosition(s, 0);
update = fastpath->rdp->update; update = fastpath->rdp->update;
if (!update || !update->pointer || !update->context) if (!update || !update->pointer || !update->context)
@ -463,6 +466,7 @@ static int fastpath_recv_update(rdpFastPath* fastpath, BYTE updateCode, wStream*
break; break;
} }
Stream_SetPosition(s, 0);
if (!rc) if (!rc)
{ {
WLog_ERR(TAG, "Fastpath update %s [%" PRIx8 "] failed, status %d", WLog_ERR(TAG, "Fastpath update %s [%" PRIx8 "] failed, status %d",
@ -548,10 +552,7 @@ static int fastpath_recv_update_data(rdpFastPath* fastpath, wStream* s)
goto out_fail; goto out_fail;
} }
Stream_SealLength(fastpath->updateData);
Stream_SetPosition(fastpath->updateData, 0);
status = fastpath_recv_update(fastpath, updateCode, fastpath->updateData); status = fastpath_recv_update(fastpath, updateCode, fastpath->updateData);
Stream_SetPosition(fastpath->updateData, 0);
if (status < 0) if (status < 0)
{ {
@ -606,10 +607,7 @@ static int fastpath_recv_update_data(rdpFastPath* fastpath, wStream* s)
} }
fastpath->fragmentation = -1; fastpath->fragmentation = -1;
Stream_SealLength(fastpath->updateData);
Stream_SetPosition(fastpath->updateData, 0);
status = fastpath_recv_update(fastpath, updateCode, fastpath->updateData); status = fastpath_recv_update(fastpath, updateCode, fastpath->updateData);
Stream_SetPosition(fastpath->updateData, 0);
if (status < 0) if (status < 0)
{ {