Changeset 73722 in vbox for trunk/src

Timestamp:

Aug 16, 2018 6:09:40 PM (7 years ago)

Author:

vboxsync

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

124401

Message:

Devices/Serial: Crash fix

File:

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

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

@@ -250 +250 @@
                 }
 
-                size_t cbProcessed = pThis->cbTxUsed;
-                rc = pThis->pDrvStream->pfnWrite(pThis->pDrvStream, &pThis->abTxBuf[0], &cbProcessed);
-                if (RT_SUCCESS(rc))
+                if (pThis->cbTxUsed)
                 {
-                    pThis->cbTxUsed -= cbProcessed;
-                    if (pThis->cbTxUsed)
+                    size_t cbProcessed = pThis->cbTxUsed;
+                    rc = pThis->pDrvStream->pfnWrite(pThis->pDrvStream, &pThis->abTxBuf[0], &cbProcessed);
+                    if (RT_SUCCESS(rc))
                     {
-                        /* Move the data in the TX buffer to the front to fill the end again. */
-                        memmove(&pThis->abTxBuf[0], &pThis->abTxBuf[cbProcessed], pThis->cbTxUsed);
+                        pThis->cbTxUsed -= cbProcessed;
+                        if (pThis->cbTxUsed)
+                        {
+                            /* Move the data in the TX buffer to the front to fill the end again. */
+                            memmove(&pThis->abTxBuf[0], &pThis->abTxBuf[cbProcessed], pThis->cbTxUsed);
+                        }
+                        else
+                            pThis->pDrvSerialPort->pfnDataSentNotify(pThis->pDrvSerialPort);
+                        STAM_COUNTER_ADD(&pThis->StatBytesWritten, cbProcessed);
                     }
-                    else
-                        pThis->pDrvSerialPort->pfnDataSentNotify(pThis->pDrvSerialPort);
-                    STAM_COUNTER_ADD(&pThis->StatBytesWritten, cbProcessed);
-                }
-                else if (rc != VERR_TIMEOUT)
-                {
-                    LogRel(("Char#%d: Write failed with %Rrc; skipping\n", pDrvIns->iInstance, rc));
-                    break;
+                    else if (rc != VERR_TIMEOUT)
+                    {
+                        LogRel(("Char#%d: Write failed with %Rrc; skipping\n", pDrvIns->iInstance, rc));
+                        break;
+                    }
                 }
             }