Changeset 79253 in vbox for trunk/src/VBox

Timestamp:

Jun 20, 2019 2:21:53 AM (6 years ago)

Author:

vboxsync

Message:

Main/GuestFileImpl.cpp: Do not fail with a bland IPRT error when a read returns zero bytes, just return a zero byte result! bugref:9320

File:

• trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -1036 +1036 @@
         if (evtType == VBoxEventType_OnGuestFileRead)
         {
+            vrc = VINF_SUCCESS;
+
             ComPtr<IGuestFileReadEvent> pFileEvent = pIEvent;
             Assert(!pFileEvent.isNull());
 
-            HRESULT hr;
             if (pvData)
             {
                 com::SafeArray <BYTE> data;
-                hr = pFileEvent->COMGETTER(Data)(ComSafeArrayAsOutParam(data));
-                ComAssertComRC(hr);
+                HRESULT hrc1 = pFileEvent->COMGETTER(Data)(ComSafeArrayAsOutParam(data));
+                ComAssertComRC(hrc1);
                 const size_t cbRead = data.size();
                 if (cbRead)
@@ -1053 +1054 @@
                         vrc = VERR_BUFFER_OVERFLOW;
                 }
-                else
-                    vrc = VERR_NO_DATA;
+                /* else: used to be VERR_NO_DATA, but that messes stuff up. */
+
+                if (pcbRead)
+                {
+                    *pcbRead = (uint32_t)cbRead;
+                    Assert(*pcbRead == cbRead);
+                }
             }
-            if (pcbRead)
+            else if (pcbRead)
             {
-                hr = pFileEvent->COMGETTER(Processed)((ULONG*)pcbRead);
-                ComAssertComRC(hr);
+                *pcbRead = 0;
+                HRESULT hrc2 = pFileEvent->COMGETTER(Processed)((ULONG *)pcbRead);
+                ComAssertComRC(hrc2); NOREF(hrc2);
             }
         }