Changeset 84843 in vbox

Timestamp:

Jun 16, 2020 9:44:14 AM (5 years ago)

Author:

vboxsync

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

138655

Message:

Guest Control/Main: Resolved another todo: Limit the default size a guest process stream buffer can grow to 32MB. bugref:9320.

File:

• trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp (modified) (3 diffs)

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

@@ -523 +523 @@
 
 GuestProcessStream::GuestProcessStream(void)
-    : m_cbAllocated(0),
-      m_cbUsed(0),
-      m_offBuffer(0),
-      m_pbBuffer(NULL)
-{
-
-}
+    : m_cbMax(_32M)
+    , m_cbAllocated(0)
+    , m_cbUsed(0)
+    , m_offBuffer(0)
+    , m_pbBuffer(NULL) { }
 
 GuestProcessStream::~GuestProcessStream(void)
@@ -540 +538 @@
  * are multiple rounds of adding data needed.
  *
- * @return  VBox status code.
+ * @return  VBox status code. Will return VERR_TOO_MUCH_DATA if the buffer's maximum (limit) has been reached.
  * @param   pbData              Pointer to data to add.
  * @param   cbData              Size (in bytes) of data to add.
@@ -579 +577 @@
         if (cbData + m_cbUsed > m_cbAllocated)
         {
-/** @todo Put an upper limit on the allocation?   */
             size_t cbAlloc = m_cbUsed + cbData;
-            cbAlloc = RT_ALIGN_Z(cbAlloc, _64K);
-            void *pvNew = RTMemRealloc(m_pbBuffer, cbAlloc);
-            if (pvNew)
+            if (cbAlloc <= m_cbMax)
             {
-                m_pbBuffer = (uint8_t *)pvNew;
-                m_cbAllocated = cbAlloc;
+                cbAlloc = RT_ALIGN_Z(cbAlloc, _64K);
+                void *pvNew = RTMemRealloc(m_pbBuffer, cbAlloc);
+                if (pvNew)
+                {
+                    m_pbBuffer = (uint8_t *)pvNew;
+                    m_cbAllocated = cbAlloc;
+                }
+                else
+                    rc = VERR_NO_MEMORY;
             }
             else
-                rc = VERR_NO_MEMORY;
+                rc = VERR_TOO_MUCH_DATA;
         }