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

Timestamp:

Jul 15, 2022 3:50:58 PM (3 years ago)

Author:

vboxsync

Message:

Recording/Main: Fixed a file sharing violation when closing recorded WebM files, which don't contain any clusters and thus getting deleted again. This needs to be done by the recording stream and not in the WebM writer class, as the WebM writer only inherited the file handle. ​bugref:9286

Location:

trunk/src/VBox/Main

Files:

• include/WebMWriter.h (modified) (1 diff)
• src-client/RecordingStream.cpp (modified) (2 diffs)
• src-client/WebMWriter.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/WebMWriter.h

@@ -553 +553 @@
     uint64_t GetAvailableSpace(void);
 
+    /**
+     * Returns the number of written WebM clusters.
+     *
+     * @returns Number of written WebM clusters; 0 when no clusters written (empty file).
+     */
+    uint64_t GetClusters(void) const { return CurSeg.cClusters; }
+
 protected:
 

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

@@ -800 +800 @@
             vrc = File.pWEBM->OpenEx(pszFile, &this->File.hFile,
 #ifdef VBOX_WITH_AUDIO_RECORDING
-                                    fAudioEnabled ? WebMWriter::AudioCodec_Opus : WebMWriter::AudioCodec_None,
+                                     fAudioEnabled ? WebMWriter::AudioCodec_Opus : WebMWriter::AudioCodec_None,
 #else
-                                    WebMWriter::AudioCodec_None,
-#endif
-                                    fVideoEnabled ? WebMWriter::VideoCodec_VP8 : WebMWriter::VideoCodec_None);
+                                     WebMWriter::AudioCodec_None,
+#endif
+                                     fVideoEnabled ? WebMWriter::VideoCodec_VP8 : WebMWriter::VideoCodec_None);
             if (RT_FAILURE(vrc))
             {
@@ -941 +941 @@
             }
 
-            if (this->File.pWEBM)
-            {
-                delete this->File.pWEBM;
+            WebMWriter *pWebMWriter = this->File.pWEBM;
+            AssertPtr(pWebMWriter);
+
+            if (pWebMWriter)
+            {
+                /* If no clusters (= data) was written, delete the file again. */
+                if (pWebMWriter->GetClusters() == 0)
+                {
+                    int vrc2 = RTFileDelete(this->ScreenSettings.File.strName.c_str());
+                    AssertRC(vrc2); /* Ignore rc on non-debug builds. */
+                }
+
+                delete pWebMWriter;
+                pWebMWriter = NULL;
+
                 this->File.pWEBM = NULL;
             }

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

@@ -151 +151 @@
     close();
 
-    int vrc = VINF_SUCCESS;
-
-    /* If no clusters (= data) was written, delete the file again. */
-    if (!CurSeg.cClusters)
-        vrc = RTFileDelete(strFileName.c_str());
-
-    LogFlowFuncLeaveRC(vrc);
-    return vrc;
+    return VINF_SUCCESS;
 }