[Spice-commits] vdagent/file_xfer.cpp vdagent/file_xfer.h

[Marc-André Lureau]

 vdagent/file_xfer.cpp |   14 ++++++++++----
 vdagent/file_xfer.h   |    5 ++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 4b9e9b1d28ea7eaec44ff73e2f91c4064986b12a
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Wed Jul 17 21:20:43 2013 +0200

    Remove usage of more _s functions
    
    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.

diff --git a/vdagent/file_xfer.cpp b/vdagent/file_xfer.cpp
index 84f6043..66b489a 100644
--- a/vdagent/file_xfer.cpp
+++ b/vdagent/file_xfer.cpp
@@ -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), "[");
diff --git a/vdagent/file_xfer.h b/vdagent/file_xfer.h
index f2f397c..649b296 100644
--- a/vdagent/file_xfer.h
+++ b/vdagent/file_xfer.h
@@ -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;