github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[channels,drive] fix file rename length checks

Browse Source
This commit is contained in:
akallabeth 2025-06-02 20:22:50 +02:00
parent 78a8dbfcbb
commit cf35364efa
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
channels/drive/client/drive_file.c
View File

@ -806,9 +806,9 @@ static BOOL drive_file_set_rename_information(DRIVE_FILE* file, UINT32 Length, w
WINPR_ASSERT(file); WINPR_ASSERT(file);
const uint32_t expect = 6; const uint32_t expect = 6;
if (Length != expect) if (Length < expect)
{ {
WLog_WARN(TAG, "Unexpected Length=%" PRIu32 ", expected %" PRIu32, Length, expect); WLog_WARN(TAG, "Unexpected Length=%" PRIu32 ", expected at least %" PRIu32, Length, expect);
return FALSE; return FALSE;
} }
@ -817,8 +817,12 @@ static BOOL drive_file_set_rename_information(DRIVE_FILE* file, UINT32 Length, w
Stream_Seek_UINT8(input); /* RootDirectory */ Stream_Seek_UINT8(input); /* RootDirectory */
const uint32_t FileNameLength = Stream_Get_UINT32(input); const uint32_t FileNameLength = Stream_Get_UINT32(input);
if (!Stream_CheckAndLogRequiredLength(TAG, input, FileNameLength)) if (Length != expect + FileNameLength)
{
WLog_WARN(TAG, "Unexpected Length=%" PRIu32 ", expected %" PRIu32, Length,
expect + FileNameLength);
return FALSE; return FALSE;
}
WCHAR* fullpath = drive_file_combine_fullpath(file->basepath, Stream_ConstPointer(input), WCHAR* fullpath = drive_file_combine_fullpath(file->basepath, Stream_ConstPointer(input),
FileNameLength / sizeof(WCHAR)); FileNameLength / sizeof(WCHAR));