Changeset 78762 in vbox for trunk/src/VBox/Main/src-server/MediumImpl.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/MediumImpl.cpp (modified) (12 diffs)

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

@@ -2563 +2563 @@
     {
         rc = pTask->createThread();
+        pTask = NULL;
 
         if (SUCCEEDED(rc))
@@ -2891 +2892 @@
     {
         rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -3169 +3170 @@
     {
         rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -3347 +3348 @@
     {
         rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -3498 +3499 @@
     {
         rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -3634 +3635 @@
     {
         rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -4961 +4962 @@
         {
             rc = pTask->runNow();
-
             delete pTask;
         }
         else
             rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc) && aProgress != NULL)
             *aProgress = pProgress;
@@ -5313 +5313 @@
         {
             rc = pTask->runNow();
-
             delete pTask;
         }
         else
             rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc) && aProgress != NULL)
             *aProgress = pProgress;
-
     }
     else
@@ -6026 +6024 @@
         {
             rc = pTask->runNow();
-
             delete pTask;
         }
         else
             rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc) && aProgress != NULL)
             *aProgress = pProgress;
@@ -6195 +6192 @@
         else
             rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc) && aProgress != NULL)
             *aProgress = pProgress;
@@ -6570 +6567 @@
 
     if (SUCCEEDED(rc))
+    {
         rc = pTask->createThread();
+        pTask = NULL;
+    }
     else if (pTask != NULL)
         delete pTask;
@@ -6717 +6717 @@
     {
         rc = pTask->createThread();
-
+        pTask = NULL;
         if (SUCCEEDED(rc))
             pProgress.queryInterfaceTo(aProgress);