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

Fixed warnings found by compiler and static analysis.

Browse Source
This commit is contained in:
Armin Novak 2019-01-24 10:33:59 +01:00
parent 58f616b687
commit 4ba73e0c73
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +54,7 @@
static void drive_file_fix_path(WCHAR* path) static void drive_file_fix_path(WCHAR* path)
{ {
size_t i; size_t i;
size_t length; size_t length = _wcslen(path);
length = (int) _wcslen(path);
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
{ {
@ -80,10 +79,10 @@ static void drive_file_fix_path(WCHAR* path)
} }
static WCHAR* drive_file_combine_fullpath(const WCHAR* base_path, const WCHAR* path, static WCHAR* drive_file_combine_fullpath(const WCHAR* base_path, const WCHAR* path,
UINT32 PathLength) size_t PathLength)
{ {
WCHAR* fullpath; WCHAR* fullpath;
UINT32 base_path_length; size_t base_path_length;
if (!base_path || !path) if (!base_path || !path)
return NULL; return NULL;
@ -107,11 +106,10 @@ static BOOL drive_file_remove_dir(const WCHAR* path)
{ {
WIN32_FIND_DATAW findFileData; WIN32_FIND_DATAW findFileData;
BOOL ret = TRUE; BOOL ret = TRUE;
INT len;
HANDLE dir; HANDLE dir;
WCHAR* fullpath; WCHAR* fullpath;
WCHAR* path_slash; WCHAR* path_slash;
UINT32 base_path_length; size_t base_path_length;
if (!path) if (!path)
return FALSE; return FALSE;
@ -140,7 +138,7 @@ static BOOL drive_file_remove_dir(const WCHAR* path)
do do
{ {
len = _wcslen(findFileData.cFileName); size_t len = _wcslen(findFileData.cFileName);
if ((len == 1 && findFileData.cFileName[0] == L'.') || (len == 2 && if ((len == 1 && findFileData.cFileName[0] == L'.') || (len == 2 &&
findFileData.cFileName[0] == L'.' && findFileData.cFileName[1] == L'.')) findFileData.cFileName[0] == L'.' && findFileData.cFileName[1] == L'.'))
@ -335,7 +333,7 @@ DRIVE_FILE* drive_file_new(const WCHAR* base_path, const WCHAR* path, UINT32 Pat
file->file_handle = INVALID_HANDLE_VALUE; file->file_handle = INVALID_HANDLE_VALUE;
file->find_handle = INVALID_HANDLE_VALUE; file->find_handle = INVALID_HANDLE_VALUE;
file->id = id; file->id = id;
file->basepath = (WCHAR*) base_path; file->basepath = base_path;
file->FileAttributes = FileAttributes; file->FileAttributes = FileAttributes;
file->DesiredAccess = DesiredAccess; file->DesiredAccess = DesiredAccess;
file->CreateDisposition = CreateDisposition; file->CreateDisposition = CreateDisposition;
@ -397,7 +395,10 @@ BOOL drive_file_seek(DRIVE_FILE* file, UINT64 Offset)
if (!file) if (!file)
return FALSE; return FALSE;
loffset.QuadPart = Offset; if (Offset > INT64_MAX)
return FALSE;
loffset.QuadPart = (LONGLONG)Offset;
return SetFilePointerEx(file->file_handle, loffset, NULL, FILE_BEGIN); return SetFilePointerEx(file->file_handle, loffset, NULL, FILE_BEGIN);
} }
@ -757,7 +758,10 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT
if (!Stream_EnsureRemainingCapacity(output, 4 + 64 + length)) if (!Stream_EnsureRemainingCapacity(output, 4 + 64 + length))
goto out_fail; goto out_fail;
Stream_Write_UINT32(output, 64 + length); /* Length */ if (length > UINT32_MAX - 64)
goto out_fail;
Stream_Write_UINT32(output, (UINT32)(64 + length)); /* Length */
Stream_Write_UINT32(output, 0); /* NextEntryOffset */ Stream_Write_UINT32(output, 0); /* NextEntryOffset */
Stream_Write_UINT32(output, 0); /* FileIndex */ Stream_Write_UINT32(output, 0); /* FileIndex */
Stream_Write_UINT32(output, file->find_data.ftCreationTime.dwLowDateTime); /* CreationTime */ Stream_Write_UINT32(output, file->find_data.ftCreationTime.dwLowDateTime); /* CreationTime */
@ -773,7 +777,7 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT
Stream_Write_UINT32(output, file->find_data.nFileSizeLow); /* AllocationSize */ Stream_Write_UINT32(output, file->find_data.nFileSizeLow); /* AllocationSize */
Stream_Write_UINT32(output, file->find_data.nFileSizeHigh); /* AllocationSize */ Stream_Write_UINT32(output, file->find_data.nFileSizeHigh); /* AllocationSize */
Stream_Write_UINT32(output, file->find_data.dwFileAttributes); /* FileAttributes */ Stream_Write_UINT32(output, file->find_data.dwFileAttributes); /* FileAttributes */
Stream_Write_UINT32(output, length); /* FileNameLength */ Stream_Write_UINT32(output, (UINT32)length); /* FileNameLength */
Stream_Write(output, file->find_data.cFileName, length); Stream_Write(output, file->find_data.cFileName, length);
break; break;
@ -783,7 +787,10 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT
if (!Stream_EnsureRemainingCapacity(output, 4 + 68 + length)) if (!Stream_EnsureRemainingCapacity(output, 4 + 68 + length))
goto out_fail; goto out_fail;
Stream_Write_UINT32(output, 68 + length); /* Length */ if (length > UINT32_MAX - 68)
goto out_fail;
Stream_Write_UINT32(output, (UINT32)(68 + length)); /* Length */
Stream_Write_UINT32(output, 0); /* NextEntryOffset */ Stream_Write_UINT32(output, 0); /* NextEntryOffset */
Stream_Write_UINT32(output, 0); /* FileIndex */ Stream_Write_UINT32(output, 0); /* FileIndex */
Stream_Write_UINT32(output, file->find_data.ftCreationTime.dwLowDateTime); /* CreationTime */ Stream_Write_UINT32(output, file->find_data.ftCreationTime.dwLowDateTime); /* CreationTime */
@ -799,7 +806,7 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT
Stream_Write_UINT32(output, file->find_data.nFileSizeLow); /* AllocationSize */ Stream_Write_UINT32(output, file->find_data.nFileSizeLow); /* AllocationSize */
Stream_Write_UINT32(output, file->find_data.nFileSizeHigh); /* AllocationSize */ Stream_Write_UINT32(output, file->find_data.nFileSizeHigh); /* AllocationSize */
Stream_Write_UINT32(output, file->find_data.dwFileAttributes); /* FileAttributes */ Stream_Write_UINT32(output, file->find_data.dwFileAttributes); /* FileAttributes */
Stream_Write_UINT32(output, length); /* FileNameLength */ Stream_Write_UINT32(output, (UINT32)length); /* FileNameLength */
Stream_Write_UINT32(output, 0); /* EaSize */ Stream_Write_UINT32(output, 0); /* EaSize */
Stream_Write(output, file->find_data.cFileName, length); Stream_Write(output, file->find_data.cFileName, length);
break; break;
@ -810,7 +817,10 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT
if (!Stream_EnsureRemainingCapacity(output, 4 + 93 + length)) if (!Stream_EnsureRemainingCapacity(output, 4 + 93 + length))
goto out_fail; goto out_fail;
Stream_Write_UINT32(output, 93 + length); /* Length */ if (length > UINT32_MAX - 93)
goto out_fail;
Stream_Write_UINT32(output, (UINT32)(93 + length)); /* Length */
Stream_Write_UINT32(output, 0); /* NextEntryOffset */ Stream_Write_UINT32(output, 0); /* NextEntryOffset */
Stream_Write_UINT32(output, 0); /* FileIndex */ Stream_Write_UINT32(output, 0); /* FileIndex */
Stream_Write_UINT32(output, file->find_data.ftCreationTime.dwLowDateTime); /* CreationTime */ Stream_Write_UINT32(output, file->find_data.ftCreationTime.dwLowDateTime); /* CreationTime */
@ -826,7 +836,7 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT
Stream_Write_UINT32(output, file->find_data.nFileSizeLow); /* AllocationSize */ Stream_Write_UINT32(output, file->find_data.nFileSizeLow); /* AllocationSize */
Stream_Write_UINT32(output, file->find_data.nFileSizeHigh); /* AllocationSize */ Stream_Write_UINT32(output, file->find_data.nFileSizeHigh); /* AllocationSize */
Stream_Write_UINT32(output, file->find_data.dwFileAttributes); /* FileAttributes */ Stream_Write_UINT32(output, file->find_data.dwFileAttributes); /* FileAttributes */
Stream_Write_UINT32(output, length); /* FileNameLength */ Stream_Write_UINT32(output, (UINT32)length); /* FileNameLength */
Stream_Write_UINT32(output, 0); /* EaSize */ Stream_Write_UINT32(output, 0); /* EaSize */
Stream_Write_UINT8(output, 0); /* ShortNameLength */ Stream_Write_UINT8(output, 0); /* ShortNameLength */
/* Reserved(1), MUST NOT be added! */ /* Reserved(1), MUST NOT be added! */
@ -840,10 +850,13 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT
if (!Stream_EnsureRemainingCapacity(output, 4 + 12 + length)) if (!Stream_EnsureRemainingCapacity(output, 4 + 12 + length))
goto out_fail; goto out_fail;
Stream_Write_UINT32(output, 12 + length); /* Length */ if (length > UINT32_MAX - 12)
goto out_fail;
Stream_Write_UINT32(output, (UINT32)(12 + length)); /* Length */
Stream_Write_UINT32(output, 0); /* NextEntryOffset */ Stream_Write_UINT32(output, 0); /* NextEntryOffset */
Stream_Write_UINT32(output, 0); /* FileIndex */ Stream_Write_UINT32(output, 0); /* FileIndex */
Stream_Write_UINT32(output, length); /* FileNameLength */ Stream_Write_UINT32(output, (UINT32)length); /* FileNameLength */
Stream_Write(output, file->find_data.cFileName, length); Stream_Write(output, file->find_data.cFileName, length);
break; break;

2
channels/drive/client/drive_file.h
View File

@ -40,7 +40,7 @@ struct _DRIVE_FILE
HANDLE file_handle; HANDLE file_handle;
HANDLE find_handle; HANDLE find_handle;
WIN32_FIND_DATAW find_data; WIN32_FIND_DATAW find_data;
WCHAR* basepath; const WCHAR* basepath;
WCHAR* fullpath; WCHAR* fullpath;
WCHAR* filename; WCHAR* filename;
BOOL delete_pending; BOOL delete_pending;