Changeset 89125 in vbox for trunk/src/VBox/Devices/Audio/AudioTest.cpp

Timestamp:

May 17, 2021 11:19:51 PM (4 years ago)

Author:

vboxsync

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

144466

Message:

AudioTest.cpp: Added missing EOF check in AudioTestWaveFileRead. bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTest.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/AudioTest.cpp

@@ -1124 +1124 @@
 int AudioTestWaveFileRead(PAUDIOTESTWAVEFILE pWaveFile, void *pvBuf, size_t cbBuf, size_t *pcbRead)
 {
+    bool fEofAdjusted;
+    if (pWaveFile->offCur + cbBuf <= pWaveFile->cbSamples)
+        fEofAdjusted = false;
+    else if (pcbRead)
+    {
+        fEofAdjusted = true;
+        cbBuf = pWaveFile->cbSamples - pWaveFile->offCur;
+    }
+    else
+        return VERR_EOF;
+
     int rc = RTFileReadAt(pWaveFile->hFile, pWaveFile->offSamples + pWaveFile->offCur, pvBuf, cbBuf, pcbRead);
     if (RT_SUCCESS(rc))
@@ -1130 +1141 @@
         {
             pWaveFile->offCur += (uint32_t)*pcbRead;
-            if (cbBuf > *pcbRead)
+            if (fEofAdjusted || cbBuf > *pcbRead)
                 rc = VINF_EOF;
             else if (!cbBuf && pWaveFile->offCur == pWaveFile->cbSamples)