Changeset 104792 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

Timestamp:

May 27, 2024 3:32:58 PM (6 months ago)

Author:

vboxsync

Message:

Shared Clipboard: X11: Prevent memory leak on clipboard protocol errors, bugref:10698.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -2737 +2737 @@
                 if (pPayload)
                 {
-                    AssertReturn(pPayload->cbData == sizeof(SHCLX11RESPONSE), VERR_INVALID_PARAMETER);
-                    AssertPtrReturn(pPayload->pvData, VERR_INVALID_POINTER);
-                    PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
-                    AssertReturn(pResp->enmType == SHCLX11EVENTTYPE_READ, VERR_INVALID_PARAMETER);
-
-                    pPayload->pvData = NULL; /* pvData (pResp) is owned by ppResp now. */
-                    pPayload->cbData = 0;
-
-                    ShClPayloadFree(pPayload);
-
-                    *ppResp = pResp;
+                    if (   pPayload->cbData == sizeof(SHCLX11RESPONSE)
+                        && RT_VALID_PTR(pPayload->pvData))
+                    {
+                        PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
+                        if (pResp->enmType == SHCLX11EVENTTYPE_READ)
+                        {
+                            pPayload->pvData = NULL; /* pvData (pResp) is owned by ppResp now. */
+                            pPayload->cbData = 0;
+
+                            ShClPayloadFree(pPayload);
+
+                            *ppResp = pResp;
+                        }
+                        else
+                            rc = VERR_INVALID_PARAMETER;
+                    }
+                    else
+                        rc = VERR_INVALID_PARAMETER;
                 }
                 else /* No payload given; could happen on invalid / not-expected formats. */