Changeset 95335 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jun 21, 2022 7:55:01 PM (3 years ago)

Author:

vboxsync

Message:

GuestProperties: Must validate the encoding of all additional pattern strings in enumProps, as HGCMSvcGetCStr stops at the first string terminator. bugref:10185

File:

• trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.cpp (modified) (2 diffs)

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

@@ -58 +58 @@
 #include <VBox/vmm/dbgf.h>
 #include <VBox/version.h>
+#include <VBox/AssertGuest.h>
 
 #include <list>
@@ -960 +961 @@
     {
         for (unsigned i = 0; i < cbPatterns - 1; ++i)
+        {
+            char ch = pchPatterns[i];
             if (pchPatterns[i] != '\0')
-                szPatterns[i] = pchPatterns[i];
+            { /* likely*/ }
             else
-                szPatterns[i] = '|';
+            {
+                /* Since the RTStrValidateEncodingEx call in HGCMSvcGetCStr stops at the
+                   first terminator, we have to validate all subsequent pattern strings. */
+                rc = RTStrValidateEncodingEx(&pchPatterns[i + 1], cbPatterns - i -1, RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED);
+                ASSERT_GUEST_RC_BREAK(rc);
+                ch = '|';
+            }
+            szPatterns[i] = ch;
+        }
         szPatterns[cbPatterns - 1] = '\0';
     }