Changeset 78762 in vbox for trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

Timestamp:

May 26, 2019 4:37:50 AM (6 years ago)

Author:

vboxsync

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

130849

Message:

Main: NULL pTask after createThread() call to catch any useage after it might be deleted. Fixed one such case in SessionMachine::takeSnapshot().

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -1577 +1577 @@
                                                    mHWData->mMemorySize,
                                                    fTakingSnapshotOnline);
+    MachineState_T const machineStateBackup = pTask->m_machineStateBackup;
     rc = pTask->createThread();
+    pTask = NULL;
     if (FAILED(rc))
         return rc;
@@ -1584 +1586 @@
     if (fTakingSnapshotOnline)
     {
-        if (pTask->m_machineStateBackup != MachineState_Paused && !fPause)
+        if (machineStateBackup != MachineState_Paused && !fPause)
             i_setMachineState(MachineState_LiveSnapshotting);
         else
@@ -2132 +2134 @@
                                                          pSnapshot);
     rc = pTask->createThread();
+    pTask = NULL;
     if (FAILED(rc))
         return rc;
@@ -2671 +2674 @@
                                                        pSnapshot);
     rc = pTask->createThread();
+    pTask = NULL;
     if (FAILED(rc))
         return rc;