mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[channel,drive] path must not end with separator 

the fullpath string must not end with a path separator as FindFirstFile
returns an error in such cases.
This commit is contained in:
Armin Novak 2023-07-26 09:38:57 +02:00 committed by Martin Fleisz
parent 3847035b8e
commit 4154779672
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@
#include <winpr/wtypes.h>
#include <winpr/crt.h>
#include <winpr/string.h>
#include <winpr/path.h>
#include <winpr/file.h>
#include <winpr/stream.h>
@ -142,15 +143,25 @@ static BOOL drive_file_set_fullpath(DRIVE_FILE* file, WCHAR* fullpath)
if (!file || !fullpath)
return FALSE;
const size_t len = _wcslen(fullpath);
free(file->fullpath);
free(file->filename);
file->fullpath = NULL;
file->filename = NULL;
if (len == 0)
return TRUE;
file->fullpath = fullpath;
file->filename = _wcsrchr(file->fullpath, L'/');
if (file->filename == NULL)
file->filename = file->fullpath;
const WCHAR sep[] = { PathGetSeparatorW(PATH_STYLE_NATIVE), '\0' };
WCHAR* filename = _wcsrchr(file->fullpath, *sep);
if (_wcsncmp(filename, sep, ARRAYSIZE(sep)) == 0)
*filename = '\0';
if (!filename || (_wcsnlen(filename, 2) <= 1))
file->filename = _wcsdup(file->fullpath);
else
file->filename += 1;
file->filename = _wcsdup(&filename[1]);
return TRUE;
}
@ -354,6 +365,7 @@ BOOL drive_file_free(DRIVE_FILE* file)
fail:
DEBUG_WSTR("Free %s", file->fullpath);
free(file->fullpath);
free(file->filename);
free(file);
return rc;
}

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

@ -27,6 +27,7 @@
#define FREERDP_CHANNEL_DRIVE_CLIENT_FILE_H
#include <winpr/stream.h>
#include <winpr/file.h>
#include <freerdp/channels/log.h>
#define TAG CHANNELS_TAG("drive.client")