Changeset 76480 in vbox for trunk/src/VBox/Additions/x11/vboxvideo/getmode.c

Timestamp:

Dec 26, 2018 2:12:14 AM (6 years ago)

Author:

vboxsync

Message:

x11/vboxvideo/getmode.c: Recent GCC correctly points out possible trunction when using strncat with a 53 char destination buffer and a 256 char source string. Attempted to placate it, hoping the code still works...

File:

• trunk/src/VBox/Additions/x11/vboxvideo/getmode.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/getmode.c

@@ -261 +261 @@
 void vbvxSetUpLinuxACPI(ScreenPtr pScreen)
 {
+    static const char s_szDevInput[] = "/dev/input/";
+    struct dirent *pDirent;
+    char szFile[sizeof(s_szDevInput) + sizeof(pDirent->d_name) + 16];
     VBOXPtr pVBox = VBOXGetRec(xf86Screens[pScreen->myNum]);
-    struct dirent *pDirent;
     DIR *pDir;
     int fd = -1;
@@ -271 +273 @@
     if (pDir == NULL)
         return;
+    memcpy(szFile, s_szDevInput, sizeof(s_szDevInput));
     for (pDirent = readdir(pDir); pDirent != NULL; pDirent = readdir(pDir))
     {
@@ -276 +279 @@
         {
 #define BITS_PER_BLOCK (sizeof(unsigned long) * 8)
-            char szFile[64] = "/dev/input/";
             char szDevice[64] = "";
             unsigned long afKeys[KEY_MAX / BITS_PER_BLOCK];
-
-            strncat(szFile, pDirent->d_name, sizeof(szFile) - sizeof("/dev/input/"));
+            size_t const cchName = strlen(pDirent->d_name);
+            if (cchName + sizeof(s_szDevInput) > sizeof(szFile))
+                continue;
+            memcpy(&szFile[sizeof(s_szDevInput) - 1], pDirent->d_name, cchName + 1);
             if (fd != -1)
                 close(fd);