Changeset 99603 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

May 4, 2023 1:17:01 PM (22 months ago)

Author:

vboxsync

Message:

Guest Additions/VBoxClient: Check for valid service pointers in case we want to stop a service which is not implemented. bugref:10427

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• draganddrop.cpp (modified) (2 diffs)
• seamless.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -65 +65 @@
 static DECLCALLBACK(int) vbclDnDWorker(bool volatile *pfShutdown)
 {
+    AssertPtrReturn(g_pSvc, VERR_NOT_IMPLEMENTED);
     return g_pSvc->worker(pfShutdown);
 }
@@ -73 +74 @@
 static DECLCALLBACK(void) vbclDnDStop(void)
 {
-    g_pSvc->stop();
+    if (g_pSvc)
+        g_pSvc->stop();
 }
 

trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp

@@ -107 +107 @@
 static DECLCALLBACK(int) vbclSeamlessWorker(bool volatile *pfShutdown)
 {
+    AssertPtrReturn(g_pSvc, VERR_NOT_IMPLEMENTED);
     return g_pSvc->worker(pfShutdown);
 }
@@ -115 +116 @@
 static DECLCALLBACK(void) vbclSeamlessStop(void)
 {
-    return g_pSvc->stop();
+    if (g_pSvc)
+        g_pSvc->stop();
 }