Changeset 70108 in vbox for trunk/include/VBox/HostServices

Timestamp:

Dec 13, 2017 12:35:13 PM (7 years ago)

Author:

vboxsync

Message:

Guest properties: Added a length check for GuestPropWriteFlags() and got rid of strcpy(), as this now also is marked as being deprecated on macOS, take #2.

File:

• trunk/include/VBox/HostServices/GuestPropertySvc.h (modified) (3 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -164 +164 @@
 /**
  * Write out flags to a string.
+ *
  * @returns  IPRT status code
- * @param    fFlags    the flags to write out
- * @param    pszFlags  where to write the flags string.  This must point to
- *                     a buffer of size (at least) MAX_FLAGS_LEN.
- */
-DECLINLINE(int) GuestPropWriteFlags(uint32_t fFlags, char *pszFlags)
+ * @param    fFlags    The flags to write out.
+ * @param    pszFlags  Where to write the flags string.
+ * @param    cbFlags   The size of the destination buffer (in bytes).
+ */
+DECLINLINE(int) GuestPropWriteFlags(uint32_t fFlags, char* pszFlags, size_t cbFlags)
 {
     /* Putting READONLY before the other RDONLY flags keeps the result short. */
@@ -179 +180 @@
 
     AssertLogRelReturn(VALID_PTR(pszFlags), VERR_INVALID_POINTER);
+    AssertLogRelReturn(cbFlags,             VERR_INVALID_PARAMETER);
+
+    pszFlags[0] = '\0';
+
     if ((fFlags & ~GUEST_PROP_F_ALLFLAGS) == GUEST_PROP_F_NILFLAG)
     {
-        char *pszNext;
         unsigned i;
 
@@ -189 +193 @@
             fFlags |= GUEST_PROP_F_TRANSIENT;
 
-        pszNext = pszFlags;
         for (i = 0; i < RT_ELEMENTS(s_aFlagList); ++i)
         {
             if (s_aFlagList[i] == (fFlags & s_aFlagList[i]))
             {
-                strcpy(pszNext, GuestPropFlagName(s_aFlagList[i]));
-                pszNext += GuestPropFlagNameLen(s_aFlagList[i]);
+                rc = RTStrCat(pszFlags, cbFlags, GuestPropFlagName(s_aFlagList[i]));
+                if (RT_FAILURE(rc))
+                    break;
+
                 fFlags &= ~s_aFlagList[i];
+
                 if (fFlags != GUEST_PROP_F_NILFLAG)
                 {
-                    strcpy(pszNext, ", ");
-                    pszNext += 2;
+                    rc = RTStrCat(pszFlags, cbFlags, ", ");
+                    if (RT_FAILURE(rc))
+                        break;
                 }
             }
         }
-        *pszNext = '\0';
 
         Assert(fFlags == GUEST_PROP_F_NILFLAG); /* bad s_aFlagList */