pxcloud/win32-vd_agent
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/win32-vd_agent synced 2025-12-29 08:42:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use SPICE_N_ELEMENTS instead of a constant for file_path size

Browse Source 
Allows to easily change the size if needed

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Frediano Ziglio 2019-12-05 08:57:01 +00:00 committed by Frediano Ziglio
parent b4776f4291
commit dd05463f9b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vdagent/file_xfer.cpp
View File

@ -105,6 +105,7 @@ void FileXfer::handle_start(VDAgentFileXferStartMessage* start,
return;
}
static_assert(SPICE_N_ELEMENTS(file_path) >= MAX_PATH, "file_path too small");
if (!get_download_directory(file_path)) {
return;
}
@ -123,7 +124,7 @@ void FileXfer::handle_start(VDAgentFileXferStartMessage* start,
wlen = _tcslen(file_path);
// make sure we have enough space
// (1 char for separator, 1 char for filename and 1 char for NUL terminator)
if (wlen + 3 >= MAX_PATH) {
if (wlen + 3 >= SPICE_N_ELEMENTS(file_path)) {
vd_printf("error: file too long %ls\\%s", file_path, file_name);
return;
}
@ -145,7 +146,8 @@ void FileXfer::handle_start(VDAgentFileXferStartMessage* start,
snprintf(dest_filename, sizeof(dest_filename),
"%.*s (%d)%s", int(extension - file_name), file_name, attempt, extension);
}
if ((MultiByteToWideChar(CP_UTF8, 0, dest_filename, -1, file_path + wlen, MAX_PATH - wlen)) == 0) {
if ((MultiByteToWideChar(CP_UTF8, 0, dest_filename, -1,
file_path + wlen, SPICE_N_ELEMENTS(file_path) - wlen)) == 0) {
vd_printf("failed converting file_name:%s to WideChar", dest_filename);
return;
}