Changeset 49389 in vbox

Timestamp:

Nov 5, 2013 1:32:12 PM (12 years ago)

Author:

vboxsync

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

90435

Message:

GuestCtrl: Main/VBoxManage: More checks for object pointers, minor logging adjustments.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)
• Main/src-client/GuestFileImpl.cpp (modified) (3 diffs)
• Main/src-client/GuestImpl.cpp (modified) (1 diff)
• Main/src-client/GuestProcessImpl.cpp (modified) (1 diff)
• Main/src-client/GuestSessionImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -67 +67 @@
 /** Our global session object which is also used in the
  *  signal handler to abort operations properly. */
-static ComPtr<IGuestSession> g_pGuestSession;
+static ComPtr<IGuestSession> g_pGuestSession = NULL;
 
 /**
@@ -700 +700 @@
 
             pCtx->pGuestSession.setNull();
-            g_pGuestSession.setNull();
-        }
-
+        }
+
+        g_pGuestSession.setNull();
         if (pCtx->handlerArg.session)
             CHECK_ERROR(pCtx->handlerArg.session, UnlockMachine());
@@ -711 +711 @@
         RTStrFree(pCtx->ppaArgv[i]);
     RTMemFree(pCtx->ppaArgv);
+    pCtx->iArgc = 0;
 }
 

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -108 +108 @@
 HRESULT GuestFile::FinalConstruct(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogFlowThisFuncEnter();
     return BaseFinalConstruct();
 }
@@ -225 +225 @@
 void GuestFile::uninit(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogFlowThisFuncEnter();
 
     /* Enclose the state transition Ready->InUninit->NotReady. */
@@ -235 +235 @@
     baseUninit();
 
-    mEventSource->UnregisterListener(mLocalListener);
-    unconst(mEventSource).setNull();
+    if (!mEventSource.isNull())
+    {
+        mEventSource->UnregisterListener(mLocalListener);
+
+        mLocalListener.setNull();
+        unconst(mEventSource).setNull();
+    }
 #endif
 

trunk/src/VBox/Main/src-client/GuestImpl.cpp

@@ -159 +159 @@
 #ifdef DEBUG
         ULONG cRefs = itSessions->second->AddRef();
-        LogFlowThisFunc(("pSession=%p, cRefs=%RU32\n", (GuestSession *)itSessions->second, cRefs > 0 ? cRefs - 1 : 0));
+        LogFlowThisFunc(("sessionID=%RU32, cRefs=%RU32\n", itSessions->first, cRefs > 1 ? cRefs - 1 : 0));
         itSessions->second->Release();
 #endif

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -279 +279 @@
     baseUninit();
 
-    mEventSource->UnregisterListener(mLocalListener);
-
-    mLocalListener.setNull();
-    unconst(mEventSource).setNull();
+    if (!mEventSource.isNull())
+    {
+        mEventSource->UnregisterListener(mLocalListener);
+
+        mLocalListener.setNull();
+        unconst(mEventSource).setNull();
+    }
 #endif
 

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -145 +145 @@
 HRESULT GuestSession::FinalConstruct(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogFlowThisFuncEnter();
     return BaseFinalConstruct();
 }
@@ -315 +315 @@
     baseUninit();
 
-    mEventSource->UnregisterListener(mLocalListener);
-    unconst(mEventSource).setNull();
-
+    if (!mEventSource.isNull())
+    {
+        mEventSource->UnregisterListener(mLocalListener);
+
+        mLocalListener.setNull();
+        unconst(mEventSource).setNull();
+    }
 #endif /* VBOX_WITH_GUEST_CONTROL */
     LogFlowFuncLeaveRC(rc);