Changeset 84908 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 22, 2020 2:49:46 PM (5 years ago)

Author:

vboxsync

Message:

Devices/UartCore: Make sure DR is only set after we've successfully read some data

File:

• trunk/src/VBox/Devices/Serial/UartCore.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Serial/UartCore.cpp

@@ -1599 +1599 @@
         size_t cbRead = 0;
         int rc = pThisCC->pDrvSerial->pfnReadRdr(pThisCC->pDrvSerial, &pThis->uRegRbr, 1, &cbRead);
-        AssertMsg(RT_SUCCESS(rc) && cbRead == 1, ("This shouldn't fail and always return one byte!\n")); RT_NOREF(rc);
-        UART_REG_SET(pThis->uRegLsr, UART_REG_LSR_DR);
-        uartIrqUpdate(pDevIns, pThis, pThisCC);
+        AssertRC(rc);
+
+        if (cbRead)
+        {
+            UART_REG_SET(pThis->uRegLsr, UART_REG_LSR_DR);
+            uartIrqUpdate(pDevIns, pThis, pThisCC);
+        }
     }
     PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);