Changeset 86294 in vbox

Timestamp:

Sep 25, 2020 8:58:28 PM (5 years ago)

Author:

vboxsync

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

140571

Message:

Main/MachineImpl.cpp: Added missing bound checks on getSerialPort and getParallelPort. (asan complained running tdApi1.py)

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -4591 +4591 @@
 HRESULT Machine::getSerialPort(ULONG aSlot, ComPtr<ISerialPort> &aPort)
 {
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    mSerialPorts[aSlot].queryInterfaceTo(aPort.asOutParam());
-
-    return S_OK;
+    if (aSlot < RT_ELEMENTS(mSerialPorts))
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        mSerialPorts[aSlot].queryInterfaceTo(aPort.asOutParam());
+        return S_OK;
+    }
+    return setError(E_INVALIDARG, tr("Serial port slot %RU32 is out of bounds (max %zu)"), aSlot, RT_ELEMENTS(mSerialPorts));
 }
 
 HRESULT Machine::getParallelPort(ULONG aSlot, ComPtr<IParallelPort> &aPort)
 {
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    mParallelPorts[aSlot].queryInterfaceTo(aPort.asOutParam());
-
-    return S_OK;
-}
+    if (aSlot < RT_ELEMENTS(mParallelPorts))
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        mParallelPorts[aSlot].queryInterfaceTo(aPort.asOutParam());
+        return S_OK;
+    }
+    return setError(E_INVALIDARG, tr("Parallel port slot %RU32 is out of bounds (max %zu)"), aSlot, RT_ELEMENTS(mParallelPorts));
+}
+
 
 HRESULT Machine::getNetworkAdapter(ULONG aSlot, ComPtr<INetworkAdapter> &aAdapter)