Changeset 102819 in vbox for trunk/src

Timestamp:

Jan 10, 2024 2:05:54 PM (16 months ago)

Author:

vboxsync

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

161007

Message:

Shared Clipboard/X11: Check if pfnOnRequestDataFromSource callback is set + relaxed check for pfnOnRequestDataFromSource, so that we don't need this when looking up a cached value (cache hit). bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (3 diffs)

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

@@ -451 +451 @@
 #endif
 
-    pCtx->Callbacks.pfnReportFormats(pCtx->pFrontend, vboxFmt, NULL /* pvUser */);
+    if (pCtx->Callbacks.pfnReportFormats)
+        pCtx->Callbacks.pfnReportFormats(pCtx->pFrontend, vboxFmt, NULL /* pvUser */);
 }
 
@@ -1499 +1500 @@
     AssertPtrReturn(pcb,  VERR_INVALID_POINTER);
 
-    AssertPtrReturn(pCtx->Callbacks.pfnOnRequestDataFromSource, VERR_INVALID_POINTER);
-
 #ifdef LOG_ENABLED
     char *pszFmts = ShClFormatsToStrA(uFmt);
@@ -1516 +1515 @@
     if (!pCacheEntry) /* Cache miss */
     {
+        AssertPtrReturn(pCtx->Callbacks.pfnOnRequestDataFromSource, VERR_INVALID_POINTER);
         rc = pCtx->Callbacks.pfnOnRequestDataFromSource(pCtx->pFrontend, uFmt, &pv, &cb,
                                                         NULL /* pvUser */);