Changeset 76239 in vbox for trunk

Timestamp:

Dec 14, 2018 6:54:20 PM (6 years ago)

Author:

vboxsync

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

127509

Message:

Main: bugref:6913: don't try to notify changes related to NULL medium objects

Location:

trunk/src/VBox/Main/src-server

Files:

• MediumImpl.cpp (modified) (1 diff)
• SnapshotImpl.cpp (modified) (2 diffs)

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

@@ -9087 +9087 @@
              * (chain->parent() is source's parent). Depth check above. */
             pTarget->i_deparent();
-            if (task.NotifyAboutChanges())
-                pMediumsForNotify.insert(task.mParentForTarget);
             pTarget->i_setParent(task.mParentForTarget);
             if (task.mParentForTarget)
+            {
                 i_deparent();
+                if (task.NotifyAboutChanges())
+                    pMediumsForNotify.insert(task.mParentForTarget);
+            }
 
             /* then, register again */

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

@@ -1791 +1791 @@
                 MediumAttachment *pAttach = *it;
                 Medium *pMedium = pAttach->i_getMedium();
+                if (!pMedium)
+                    continue;
 
                 bool fFound = false;
@@ -2285 +2287 @@
                 MediumAttachment *pAttach = *it;
                 Medium *pMedium = pAttach->i_getMedium();
+                if (!pMedium)
+                    continue;
 
                 bool fFound = false;