Merge pull request #1269 from iskunk/vg-fix-14

Fix for Valgrind-reported leaked file handle
csound · Apr 24, 2021 · 8ac6301 · 8ac6301
2 parents 69e7d01 + b3e0540
commit 8ac6301
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/interfaces/csPerfThread.cpp b/interfaces/csPerfThread.cpp
@@ -221,6 +221,13 @@ class CsPerfThreadMsg_Record: public CsoundPerformanceThreadMessage {
       return 0;
     }
     ~CsPerfThreadMsg_Record() {
+        CsoundPerformanceThreadMessage::lockRecord();
+        recordData_t *recordData = CsoundPerformanceThreadMessage::getRecordData();
+        if (recordData->sfile) {
+            sf_close((SNDFILE *) recordData->sfile);
+            recordData->sfile = NULL;
+        }
+        CsoundPerformanceThreadMessage::unlockRecord();
     }
 private:
     std::string filename;
@@ -239,7 +246,10 @@ class CsPerfThreadMsg_StopRecord: public CsoundPerformanceThreadMessage {
       if (recordData->running) {
           recordData->running = false;
           csoundJoinThread(recordData->thread);
-          sf_close((SNDFILE *) recordData->sfile);
+          if (recordData->sfile) {
+            sf_close((SNDFILE *) recordData->sfile);
+            recordData->sfile = NULL;
+          }
       }
 
       CsoundPerformanceThreadMessage::unlockRecord();