Changeset 65177 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 6, 2017 10:24:59 AM (8 years ago)

Author:

vboxsync

Message:

VideoRec: Cleanup fixes.

File:

• trunk/src/VBox/Main/src-client/VideoRec.cpp (modified) (3 diffs)

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

@@ -525 +525 @@
                 delete pStream->pEBML;
 
+            it = pCtx->vecStreams.erase(it);
+
             RTMemFree(pStream);
             pStream = NULL;
-
-            it = pCtx->vecStreams.erase(it);
         }
 
@@ -568 +568 @@
     RTSemEventDestroy(pCtx->TermEvent);
 
-    for (VideoRecStreams::iterator it = pCtx->vecStreams.begin(); it != pCtx->vecStreams.end(); it++)
+    VideoRecStreams::iterator it = pCtx->vecStreams.begin();
+    while (it != pCtx->vecStreams.end())
     {
         PVIDEORECSTREAM pStream = (*it);
@@ -591 +592 @@
         }
 
-        delete pStream->pEBML;
-    }
-
+        if (pStream->pEBML)
+        {
+            delete pStream->pEBML;
+            pStream->pEBML = NULL;
+        }
+
+        it = pCtx->vecStreams.erase(it);
+
+        RTMemFree(pStream);
+        pStream = NULL;
+    }
+
+    Assert(pCtx->vecStreams.empty());
     RTMemFree(pCtx);