Changeset 70086 in vbox for trunk/src/VBox/HostServices/GuestProperties

Timestamp:

Dec 12, 2017 5:36:51 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.

Location:

trunk/src/VBox/HostServices/GuestProperties

Files:

• service.cpp (modified) (5 diffs)
• testcase/tstGuestPropSvc.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -619 +619 @@
     {
         char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
-        rc = GuestPropWriteFlags(pProp->mFlags, szFlags);
+        rc = GuestPropWriteFlags(pProp->mFlags, szFlags, sizeof(szFlags));
         if (RT_SUCCESS(rc))
         {
@@ -857 +857 @@
 
     char            szFlags[GUEST_PROP_MAX_FLAGS_LEN];
-    int rc = GuestPropWriteFlags(pProp->mFlags, szFlags);
+    int rc = GuestPropWriteFlags(pProp->mFlags, szFlags, sizeof(szFlags));
     if (RT_FAILURE(rc))
         return rc;
@@ -1016 +1016 @@
     {
         char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
-        rc = GuestPropWriteFlags(prop.mFlags, szFlags);
+        rc = GuestPropWriteFlags(prop.mFlags, szFlags, sizeof(szFlags));
         if (RT_SUCCESS(rc))
         {
@@ -1215 +1215 @@
             /* Send out a host notification */
             const char *pszValue = prop.mValue.c_str();
-            rc = GuestPropWriteFlags(prop.mFlags, szFlags);
+            rc = GuestPropWriteFlags(prop.mFlags, szFlags, sizeof(szFlags));
             if (RT_SUCCESS(rc))
                 rc = notifyHost(pszProperty, pszValue, u64Timestamp, szFlags);
@@ -1406 +1406 @@
 
     char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
-    int rc = GuestPropWriteFlags(pProp->mFlags, szFlags);
+    int rc = GuestPropWriteFlags(pProp->mFlags, szFlags, sizeof(szFlags));
     if (RT_FAILURE(rc))
         RTStrPrintf(szFlags, sizeof(szFlags), "???");

trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp

@@ -120 +120 @@
         if (RT_SUCCESS(rc))
         {
-            rc = GuestPropWriteFlags(fFlags, pszFlagBuffer);
+            rc = GuestPropWriteFlags(fFlags, pszFlagBuffer, GUEST_PROP_MAX_FLAGS_LEN);
             if (RT_FAILURE(rc))
                 RTTestIFailed("Failed to convert flag string '%s' back to a string.",
@@ -159 +159 @@
         RTTestISub("Rejection of an invalid flags field");
         /* This is required to fail. */
-        if (RT_SUCCESS(GuestPropWriteFlags(u32BadFlags, pszFlagBuffer)))
+        if (RT_SUCCESS(GuestPropWriteFlags(u32BadFlags, pszFlagBuffer, GUEST_PROP_MAX_FLAGS_LEN)))
         {
             RTTestIFailed("Flags 0x%x were incorrectly written out as '%.*s'\n",
@@ -828 +828 @@
     {
         char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
-        if (RT_FAILURE(GuestPropWriteFlags(fFlags, szFlags)))
+        if (RT_FAILURE(GuestPropWriteFlags(fFlags, szFlags, sizeof(szFlags))))
             RTTestIFailed("Failed to set the global flags.");
         else