Changeset 54735 in vbox for trunk/src/VBox

Timestamp:

Mar 12, 2015 8:41:54 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

98904

Message:

PS2M.cpp: Avoid division by chainsaw restoring old state or worse.

Location:

trunk/src/VBox/Devices/Input

Files:

• DevPS2.cpp (modified) (1 diff)
• PS2M.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -1207 +1207 @@
             SSMR3GetS32(pSSM, &i32Dummy);
         }
-        SSMR3GetU8(pSSM, &u8Dummy);
+        rc = SSMR3GetU8(pSSM, &u8Dummy);
         if (version_id == 4)
         {
             SSMR3GetU32(pSSM, &u32Dummy);
-            SSMR3GetU32(pSSM, &u32Dummy);
+            rc = SSMR3GetU32(pSSM, &u32Dummy);
         }
         if (version_id > 3)
-            SSMR3GetU8(pSSM, &u8Dummy);
+            rc = SSMR3GetU8(pSSM, &u8Dummy);
         if (version_id == 4)
-            SSMR3GetU8(pSSM, &u8Dummy);
+            rc = SSMR3GetU8(pSSM, &u8Dummy);
+        AssertLogRelRCReturn(rc, rc);
 
         PS2MFixupState(&s->Aux, u8State, u8Rate, u8Proto);

trunk/src/VBox/Devices/Input/PS2M.cpp

@@ -441 +441 @@
 static void ps2mSetRate(PPS2M pThis, uint8_t rate)
 {
-    pThis->uThrottleDelay = 1000 / rate;
+    pThis->uThrottleDelay = rate ? 1000 / rate : 0;
     pThis->u8SampleRate = rate;
     LogFlowFunc(("Sampling rate %u, throttle delay %u ms\n", pThis->u8SampleRate, pThis->uThrottleDelay));