Changeset 67757 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jul 3, 2017 1:52:33 PM (8 years ago)

Author:

vboxsync

Message:

AdpCtl: bugref:8866: play safe and use snprintf()

File:

• trunk/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp

@@ -320 +320 @@
                 }
             }
-            pszBuffer = new char[strlen(pcszAddress) + 4]; // '/xx\0'
-            sprintf(pszBuffer, "%s/%u", pcszAddress, cBits);
+            const size_t cbBuf = strlen(pcszAddress) + 4;
+            pszBuffer = new char[cbBuf]; // '/xx\0'
+            snprintf(pszBuffer, cbBuf, "%s/%u", pcszAddress, cBits);
             return pszBuffer;
         }
@@ -486 +487 @@
     int add(char *pszNameInOut);
     int remove(const char *pcszName);
-    int checkName(const char *pcszNameIn, char *pszNameOut);
+    int checkName(const char *pcszNameIn, char *pszNameOut, size_t cbNameOut);
 protected:
     virtual int doIOCtl(unsigned long iCmd, VBOXNETADPREQ *pReq);
@@ -588 +589 @@
 }
 
-int Adapter::checkName(const char *pcszNameIn, char *pszNameOut)
+int Adapter::checkName(const char *pcszNameIn, char *pszNameOut, size_t cbNameOut)
 {
     int iAdapterIndex = -1;
@@ -599 +600 @@
         return ADPCTLERR_BAD_NAME;
     }
-    sprintf(pszNameOut, "vboxnet%d", iAdapterIndex);
+    snprintf(pszNameOut, cbNameOut, "vboxnet%d", iAdapterIndex);
     if (strcmp(pszNameOut, pcszNameIn))
     {
@@ -702 +703 @@
     }
 #endif
-    
-    rc = g_adapter.checkName(argv[1], szAdapterName);
+
+    rc = g_adapter.checkName(argv[1], szAdapterName, sizeof(szAdapterName));
     if (rc)
         return rc;