Fixed the "double free" .wav-saving issue (#289)

kometbomb · Mar 21, 2020 · 99635da · 99635da
1 parent 6fec1b6
commit 99635da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/action.c b/src/action.c
@@ -725,8 +725,8 @@ void export_channels_action(void *a, void*b, void*c)
 
 			if (f)
 			{
-				export_wav(&mused.song, mused.mus.cyd->wavetable_entries, f, i);
-				fclose(f);
+				if (export_wav(&mused.song, mused.mus.cyd->wavetable_entries, f, i))
+					fclose(f); // Call only if not aborted
 			}
 		}
 	}

diff --git a/src/export.c b/src/export.c
@@ -38,7 +38,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 extern GfxDomain *domain;
 
-void export_wav(MusSong *song, CydWavetableEntry * entry, FILE *f, int channel)
+bool export_wav(MusSong *song, CydWavetableEntry * entry, FILE *f, int channel)
 {
 	MusEngine mus;
 	CydEngine cyd;
@@ -129,6 +129,8 @@ void export_wav(MusSong *song, CydWavetableEntry * entry, FILE *f, int channel)
 		}
 	}
 
+	return true; // Successful (not aborted)
+
 abort:;
 
 	ww_finish(ww);
@@ -138,5 +140,7 @@ abort:;
 	cyd_deinit(&cyd);
 
 	song->flags &= ~MUS_NO_REPEAT;
+
+	return false; // Aborted
 }
 
diff --git a/src/export.h b/src/export.h
@@ -28,6 +28,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "snd/music.h"
 
-void export_wav(MusSong *song, CydWavetableEntry * entry, FILE *f, int channel);
+bool export_wav(MusSong *song, CydWavetableEntry * entry, FILE *f, int channel);
 
 #endif