Changeset 95839 in vbox for trunk/src/VBox

Timestamp:

Jul 26, 2022 8:24:11 PM (2 years ago)

Author:

vboxsync

Message:

Recording/Main: Fixed a regression when loading settings < 1.19: There we use a bitmap instead of a count, so make sure to iterate by the number of configured monitors and use the bitmap for the monitor recording enabled status instead. bugref:9286

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (8 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -6062 +6062 @@
  * or \<Recording\> under \<Machine\>,
  */
-void MachineConfigFile::readRecordingSettings(const xml::ElementNode &elmRecording, RecordingSettings &recording)
-{
+void MachineConfigFile::readRecordingSettings(const xml::ElementNode &elmRecording, uint32_t cMonitors, RecordingSettings &recording)
+{
+    if (cMonitors > 64)
+        throw ConfigFileError(this, &elmRecording, N_("Invalid monitor count given"));
+
     elmRecording.getAttributeValue("enabled", recording.common.fEnabled);
 
@@ -6078 +6081 @@
         if (cScreens != plstScreens.size())
             throw ConfigFileError(this, &elmRecording, N_("Recording/@screens attribute does not match stored screen objects"));
+        if (cScreens > 64)
+            throw ConfigFileError(this, &elmRecording, N_("Recording/@screens attribute is invalid"));
 
         for (xml::ElementNodesList::iterator itScreen  = plstScreens.begin();
@@ -6132 +6137 @@
 
         /* Convert the enabled screens to the former uint64_t bit array and vice versa. */
-        uint64_t cScreens = 0;
-        elmRecording.getAttributeValue("screens",   cScreens);
+        uint64_t uScreensBitmap = 0;
+        elmRecording.getAttributeValue("screens",   uScreensBitmap);
 
         /* Note: For settings < 1.19 the "screens" attribute is a bit field for all screens
          *       which are ENABLED for recording. The settings for recording are for all the same though. */
-        for (unsigned i = 0; i <  cScreens; i++)
+        for (unsigned i = 0; i < cMonitors; i++)
         {
             /* Apply settings of screen 0 to screen i and enable it. */
             recording.mapScreens[i] = screen0;
 
-            if (cScreens & RT_BIT_64(i)) /* Screen i enabled? */
+            if (uScreensBitmap & RT_BIT_64(i)) /* Screen i enabled? */
                 recording.mapScreens[i].fEnabled = true;
         }
@@ -6275 +6280 @@
             const xml::ElementNode *pelmVideoCapture = pelmHardware->findChildElement("VideoCapture");
             if (pelmVideoCapture)
-                readRecordingSettings(*pelmVideoCapture, pSnap->recordingSettings);
+                readRecordingSettings(*pelmVideoCapture, pSnap->hardware.graphicsAdapter.cMonitors, pSnap->recordingSettings);
         }
         else /* >= VBox 7.0 */
@@ -6281 +6286 @@
             const xml::ElementNode *pelmRecording = pElement->findChildElement("Recording");
             if (pelmRecording)
-                readRecordingSettings(*pelmRecording, pSnap->recordingSettings);
+                readRecordingSettings(*pelmRecording, pSnap->hardware.graphicsAdapter.cMonitors, pSnap->recordingSettings);
         }
         // note: Groups exist only for Machine, not for Snapshot
@@ -6476 +6481 @@
                 && m->sv <  SettingsVersion_v1_19
                 && pelmMachineChild->nameEquals("VideoCapture"))   /* For settings >= 1.14 (< VBox 7.0). */
-                readRecordingSettings(*pelmMachineChild, recordingSettings);
+                readRecordingSettings(*pelmMachineChild, hardwareMachine.graphicsAdapter.cMonitors, recordingSettings);
             else if (   m->sv >= SettingsVersion_v1_19
                      && pelmMachineChild->nameEquals("Recording")) /* Only exists for settings >= 1.19 (VBox 7.0). */
-                readRecordingSettings(*pelmMachineChild, recordingSettings);
+                readRecordingSettings(*pelmMachineChild, hardwareMachine.graphicsAdapter.cMonitors, recordingSettings);
         }
 
@@ -8116 +8121 @@
         return;
 
+    AssertReturnVoid(recording.mapScreens.size() <= 64); /* Make sure we never exceed the bitmap of 64 monitors. */
+
     /* Note: Since settings 1.19 the recording settings have a dedicated XML branch outside of Hardware. */
     if (m->sv >= SettingsVersion_v1_19 /* VBox >= 7.0 */)
@@ -8196 +8203 @@
 
         /* Convert the enabled screens to the former uint64_t bit array and vice versa. */
-        uint64_t u64VideoCaptureScreens = 0;
+        uint64_t uScreensBitmap = 0;
         RecordingScreenSettingsMap::const_iterator itScreen = recording.mapScreens.begin();
         while (itScreen != recording.mapScreens.end())
         {
             if (itScreen->second.fEnabled)
-               u64VideoCaptureScreens |= RT_BIT_64(itScreen->first);
+                uScreensBitmap |= RT_BIT_64(itScreen->first);
             ++itScreen;
         }
 
-        if (u64VideoCaptureScreens)
-            pelmVideoCapture->setAttribute("screens",      u64VideoCaptureScreens);
+        if (uScreensBitmap)
+            pelmVideoCapture->setAttribute("screens",      uScreensBitmap);
 
         Assert(recording.mapScreens.size());