Changeset 97609 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 18, 2022 3:59:28 PM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Catch OOM situations in GuestFile::read() + GuestFile::readAt().

File:

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

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

@@ -1639 +1639 @@
         aToRead = _1M;
 
-    aData.resize(aToRead);
-
     HRESULT hrc = S_OK;
 
-    uint32_t cbRead;
-    int vrc = i_readData(aToRead, aTimeoutMS,
+    int vrc;
+    try
+    {
+        aData.resize(aToRead);
+
+        uint32_t cbRead;
+        vrc = i_readData(aToRead, aTimeoutMS,
                          &aData.front(), aToRead, &cbRead);
 
-    if (RT_SUCCESS(vrc))
-    {
-        if (aData.size() != cbRead)
-            aData.resize(cbRead);
-    }
-    else
-    {
-        aData.resize(0);
-
+        if (RT_SUCCESS(vrc))
+        {
+            if (aData.size() != cbRead)
+                aData.resize(cbRead);
+        }
+        else
+        {
+            aData.resize(0);
+        }
+    }
+    catch (std::bad_alloc &)
+    {
+        vrc = VERR_NO_MEMORY;
+    }
+
+    if (RT_FAILURE(vrc))
         hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading from file \"%s\" failed: %Rrc"),
                            mData.mOpenInfo.mFilename.c_str(), vrc);
-    }
 
     LogFlowFuncLeaveRC(vrc);
@@ -1678 +1687 @@
         aToRead = _1M;
 
-    aData.resize(aToRead);
-
     HRESULT hrc = S_OK;
 
-    size_t cbRead;
-    int vrc = i_readDataAt(aOffset, aToRead, aTimeoutMS,
+    int vrc;
+    try
+    {
+        aData.resize(aToRead);
+
+        size_t cbRead;
+        vrc = i_readDataAt(aOffset, aToRead, aTimeoutMS,
                            &aData.front(), aToRead, &cbRead);
-    if (RT_SUCCESS(vrc))
-    {
-        if (aData.size() != cbRead)
-            aData.resize(cbRead);
-    }
-    else
-    {
-        aData.resize(0);
-
+        if (RT_SUCCESS(vrc))
+        {
+            if (aData.size() != cbRead)
+                aData.resize(cbRead);
+        }
+        else
+        {
+            aData.resize(0);
+        }
+    }
+    catch (std::bad_alloc &)
+    {
+        vrc = VERR_NO_MEMORY;
+    }
+
+    if (RT_FAILURE(vrc))
         hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading from file \"%s\" (at offset %RU64) failed: %Rrc"),
                            mData.mOpenInfo.mFilename.c_str(), aOffset, vrc);
-    }
 
     LogFlowFuncLeaveRC(vrc);