Changeset 69330 in vbox

Timestamp:

Oct 26, 2017 9:34:35 AM (8 years ago)

Author:

vboxsync

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

118654

Message:

Fixed the bug when ComPtr<Progress> object can stay uninitialized

File:

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

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

@@ -4769 +4769 @@
             /* use the existing progress object... */
             pProgress = *aProgress;
-
+        }
+        else
+        {
             /* ...but create a new one if it is null */
-            if (pProgress.isNull())
-            {
-                pProgress.createObject();
-                rc = pProgress->init(m->pVirtualBox,
-                                     static_cast<IMedium*>(this),
-                                     BstrFmt(tr("Creating differencing medium storage unit '%s'"),
-                                             aTarget->m->strLocationFull.c_str()).raw(),
-                                     TRUE /* aCancelable */);
-                if (FAILED(rc))
-                    throw rc;
-            }
+
+            pProgress.createObject();
+            rc = pProgress->init(m->pVirtualBox,
+                                 static_cast<IMedium*>(this),
+                                 BstrFmt(tr("Creating differencing medium storage unit '%s'"),
+                                         aTarget->m->strLocationFull.c_str()).raw(),
+                                 TRUE /* aCancelable */);
+            if (FAILED(rc))
+                throw rc;
         }
 
@@ -5113 +5113 @@
             /* use the existing progress object... */
             pProgress = *aProgress;
-
+        }
+        else
+        {
             /* ...but create a new one if it is null */
             if (pProgress.isNull())
@@ -5787 +5789 @@
             /* use the existing progress object... */
             pProgress = *aProgress;
-
+        }
+        else
+        {
             /* ...but create a new one if it is null */
-            if (pProgress.isNull())
-            {
-                Utf8Str tgtName;
-                {
-                    AutoReadLock alock(pTarget COMMA_LOCKVAL_SRC_POS);
-                    tgtName = pTarget->i_getName();
-                }
-
-                AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-                pProgress.createObject();
-                rc = pProgress->init(m->pVirtualBox,
-                                     static_cast<IMedium*>(this),
-                                     BstrFmt(tr("Merging medium '%s' to '%s'"),
-                                             i_getName().c_str(),
-                                             tgtName.c_str()).raw(),
-                                     TRUE /* aCancelable */);
-                if (FAILED(rc))
-                    throw rc;
-            }
+            Utf8Str tgtName;
+            {
+                AutoReadLock alock(pTarget COMMA_LOCKVAL_SRC_POS);
+                tgtName = pTarget->i_getName();
+            }
+
+            AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+            pProgress.createObject();
+            rc = pProgress->init(m->pVirtualBox,
+                                 static_cast<IMedium*>(this),
+                                 BstrFmt(tr("Merging medium '%s' to '%s'"),
+                                         i_getName().c_str(),
+                                         tgtName.c_str()).raw(),
+                                 TRUE /* aCancelable */);
+            if (FAILED(rc))
+                throw rc;
         }
 
@@ -5828 +5829 @@
         {
             rc = pTask->runNow();
-
             delete pTask;
         }