Changeset 74530 in vbox for trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp

Timestamp:

Sep 28, 2018 5:45:20 PM (6 years ago)

Author:

vboxsync

Message:

Main,Devices: Compile fixes (gcc 8.2.0-7).

File:

• trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp

@@ -46 +46 @@
  * @returns VBox status code.
  *
- * @param   pszName     The buffer of IFNAMSIZ+1 length where to put the name.
+ * @param   pszName     The buffer where to put the name.
+ * @param   cbName      Size of of the destination buffer.
  */
-static int getDefaultIfaceName(char *pszName)
+static int getDefaultIfaceName(char *pszName, size_t cbName)
 {
     FILE *fp = fopen("/proc/net/route", "r");
@@ -72 +73 @@
             {
                 fclose(fp);
-                strncpy(pszName, szIfName, 16);
-                pszName[16] = 0;
-                return VINF_SUCCESS;
+                szIfName[sizeof(szIfName) - 1] = '\0';
+                return RTStrCopy(pszName, cbName, szIfName);
             }
         }
@@ -220 +220 @@
 {
     char szDefaultIface[256];
-    int rc = getDefaultIfaceName(szDefaultIface);
+    int rc = getDefaultIfaceName(szDefaultIface, sizeof(szDefaultIface));
     if (RT_FAILURE(rc))
     {
         Log(("NetIfList: Failed to find default interface.\n"));
-        szDefaultIface[0] = 0;
+        szDefaultIface[0] = '\0';
     }
     int sock = socket(AF_INET, SOCK_DGRAM, 0);