Changeset 74530 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox

Files:

• Devices/Network/testcase/tstIntNet-1.cpp (modified) (4 diffs)
• Main/src-server/MachineImplMoveVM.cpp (modified) (1 diff)
• Main/src-server/linux/NetIf-linux.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

@@ -608 +608 @@
  * @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      The buffer length.
  */
-static int getDefaultIfaceName(char *pszName)
+static int getDefaultIfaceName(char *pszName, size_t cbName)
 {
     FILE *fp = fopen("/proc/net/route", "r");
@@ -634 +635 @@
             {
                 fclose(fp);
-                strncpy(pszName, szIfName, 16);
-                pszName[16] = 0;
-                return VINF_SUCCESS;
+                szIfName[sizeof(szIfName) - 1] = '\0';
+                return RTStrCopy(pszName, cbName, szIfName);
             }
         }
@@ -684 +684 @@
      * If we fail we still have our reasonable default.
      */
-    getDefaultIfaceName(szIf);
+    getDefaultIfaceName(szIf, sizeof(szIf));
     const char *pszIf = szIf;
 #elif defined(RT_OS_SOLARIS)
@@ -862 +862 @@
     OpenReq.Hdr.cbReq = sizeof(OpenReq);
     OpenReq.pSession = pSession;
-    strncpy(OpenReq.szNetwork, pszNetwork, sizeof(OpenReq.szNetwork));
-    strncpy(OpenReq.szTrunk, pszIf, sizeof(OpenReq.szTrunk));
+    RTStrCopy(OpenReq.szNetwork, sizeof(OpenReq.szNetwork), pszNetwork);
+    RTStrCopy(OpenReq.szTrunk, sizeof(OpenReq.szTrunk), pszIf);
     OpenReq.enmTrunkType = *pszIf ? kIntNetTrunkType_NetFlt : kIntNetTrunkType_WhateverNone;
     OpenReq.fFlags = fMacSharing ? INTNET_OPEN_FLAGS_SHARED_MAC_ON_WIRE : 0;

trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

@@ -1425 +1425 @@
 
             MEDIUMTASKCHAINMOVE mtc;
-            mtc.devType = deviceType;
+            mtc.devType       = deviceType;
+            mtc.fAttachLinked = false;
+            mtc.fCreateDiffs  = false;
 
             while (!pMedium.isNull())

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);