pxcloud/win32-vd_agent
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/win32-vd_agent synced 2025-12-26 21:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove usage of more _s functions

Browse Source 
Even before this change, it should have handled error conditions. We'd
be better off allocating those strings and failing on io op later on.
This commit is contained in:
Marc-André Lureau 2013-07-17 21:20:43 +02:00
parent ad61eec961
commit 4b9e9b1d28
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vdagent/file_xfer.cpp
View File

@ -66,8 +66,14 @@ void FileXfer::handle_start(VDAgentFileXferStartMessage* start,
vd_printf("insufficient disk space %" PRIu64, free_bytes.QuadPart);
return;
}
strcat_s(file_path, MAX_PATH, "\\");
strcat_s(file_path, MAX_PATH, file_name);
if (strlen(file_path) + strlen(file_name) + 1 >= MAX_PATH) {
vd_printf("error: file too long %s\%s", file_path, file_name);
return;
}
strcat(file_path, "\\");
strcat(file_path, file_name);
handle = CreateFileA(file_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL);
if (handle == INVALID_HANDLE_VALUE) {
vd_printf("failed creating %s %lu", file_path, GetLastError());
@ -173,10 +179,10 @@ bool FileXfer::g_key_get_string(char* data, const char* group, const char* key,
char group_pfx[G_KEY_MAX_LEN], key_pfx[G_KEY_MAX_LEN];
char *group_pos, *key_pos, *next_group_pos;
sprintf_s(group_pfx, sizeof(group_pfx), "[%s]", group);
snprintf(group_pfx, sizeof(group_pfx), "[%s]", group);
if (!(group_pos = strstr((char*)data, group_pfx))) return false;
sprintf_s(key_pfx, sizeof(key_pfx), "\n%s=", key);
snprintf(key_pfx, sizeof(key_pfx), "\n%s=", key);
if (!(key_pos = strstr(group_pos, key_pfx))) return false;
next_group_pos = strstr(group_pos + strlen(group_pfx), "[");

5
vdagent/file_xfer.h
View File

@ -23,7 +23,10 @@
typedef struct ALIGN_VC FileXferTask {
FileXferTask(HANDLE _handle, uint64_t _size, char* _name):
handle(_handle), size(_size), pos(0) { strcpy_s(name, MAX_PATH, _name); }
handle(_handle), size(_size), pos(0) {
// FIXME: should raise an error if name is too long..
strncpy(name, _name, sizeof(name) - 1);
}
HANDLE handle;
uint64_t size;
uint64_t pos;