Changeset 92772 in vbox

Timestamp:

Dec 6, 2021 7:09:30 PM (3 years ago)

Author:

vboxsync

Message:

Host Services: Shared Clipboard: reference counting fix for events produced by ShClEventSourceGenerateAndRegisterEvent(), bugref:10160.

In this commit, ShClEventSourceGenerateAndRegisterEvent() takes reference to created event,
release reference is expected to be released by caller.

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-common.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (1 diff)

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

@@ -240 +240 @@
                     LogFlowFunc(("uSource=%RU16: New event: %#x\n", pSource->uID, idEvent));
 
+                    ShClEventRetain(pEvent);
                     *ppEvent = pEvent;
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -1293 +1293 @@
                     shClSvcMsgAdd(pClient, pMsg, true /* fAppend */);
 
-                    /* Retain the last event generated (in case there were multiple clipboard formats)
-                     * if we need to return the event to the caller. */
+                    /* Return event handle to the caller if requested. */
                     if (ppEvent)
                     {
-                        ShClEventRetain(pEvent);
                         *ppEvent = pEvent;
                     }
 
                     shClSvcClientWakeup(pClient);
+                }
+
+                /* Remove event from list if caller did not request event handle or in case
+                 * of failure (in this case caller should not release event). */
+                if (   RT_FAILURE(rc)
+                    || !ppEvent)
+                {
+                    ShClEventRelease(pEvent);
                 }
             }