Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-12 01:30:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

audacious: Remove file leaks

Browse Source
This commit is contained in:
John K. Luebs 2023-01-22 08:10:10 -06:00
parent 74475a3846
commit 4bfdcbe46d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audacious/plugin.cc
View File

@ -142,10 +142,11 @@ bool VgmstreamPlugin::is_our_file(const char * filename, VFSFile & file) {
if (!sf) return false; if (!sf) return false;
VGMSTREAM* infostream = init_vgmstream_from_STREAMFILE(sf); VGMSTREAM* infostream = init_vgmstream_from_STREAMFILE(sf);
if (!infostream) {
close_streamfile(sf); close_streamfile(sf);
if (!infostream) {
return false; return false;
} }
close_vgmstream(infostream);
return true; return true;
} }
@ -229,12 +230,11 @@ static bool read_info(const char* filename, Tuple & tuple) {
sf->stream_index = subtune; sf->stream_index = subtune;
VGMSTREAM* infostream = init_vgmstream_from_STREAMFILE(sf); VGMSTREAM* infostream = init_vgmstream_from_STREAMFILE(sf);
if (!infostream) {
close_streamfile(sf); close_streamfile(sf);
if (!infostream) {
return false; return false;
} }
int total_subtunes = infostream->num_streams; int total_subtunes = infostream->num_streams;
// int was changed to short in some version, though vgmstream formats can exceed it // int was changed to short in some version, though vgmstream formats can exceed it
@ -245,7 +245,6 @@ static bool read_info(const char* filename, Tuple & tuple) {
//set nullptr to leave subsong index linear (must add +1 to subtune) //set nullptr to leave subsong index linear (must add +1 to subtune)
tuple.set_subtunes(total_subtunes, nullptr); tuple.set_subtunes(total_subtunes, nullptr);
close_streamfile(sf);
close_vgmstream(infostream); close_vgmstream(infostream);
return true; return true;
} }
@ -342,8 +341,6 @@ static bool read_info(const char* filename, Tuple & tuple) {
} }
} }
close_streamfile(sf);
close_vgmstream(infostream); close_vgmstream(infostream);
return true; return true;
@ -396,7 +393,6 @@ bool VgmstreamPlugin::play(const char * filename, VFSFile & file) {
if (!vgmstream) { if (!vgmstream) {
AUDINFO("filename %s is not a valid format\n", filename); AUDINFO("filename %s is not a valid format\n", filename);
close_vgmstream(vgmstream);
return false; return false;
} }
@ -405,7 +401,6 @@ bool VgmstreamPlugin::play(const char * filename, VFSFile & file) {
//todo apply config //todo apply config
apply_config(vgmstream, &settings); apply_config(vgmstream, &settings);
int input_channels = vgmstream->channels; int input_channels = vgmstream->channels;