TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

flac: fix leak; properly close stream upon closing FlacAudioCursor

Browse Source
This commit is contained in:
rdb 2018-11-27 20:59:51 +01:00
parent da079c5ffe
commit 5dd0db300b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/movies/flacAudioCursor.cxx
View File

@ -59,7 +59,8 @@ FlacAudioCursor::
FlacAudioCursor(FlacAudio *src, std::istream *stream) : FlacAudioCursor(FlacAudio *src, std::istream *stream) :
MovieAudioCursor(src), MovieAudioCursor(src),
_is_valid(false), _is_valid(false),
_drflac(nullptr) _drflac(nullptr),
_stream(stream)
{ {
nassertv(stream != nullptr); nassertv(stream != nullptr);
nassertv(stream->good()); nassertv(stream->good());
@ -91,6 +92,9 @@ FlacAudioCursor::
if (_drflac != nullptr) { if (_drflac != nullptr) {
drflac_close(_drflac); drflac_close(_drflac);
} }
if (_stream != nullptr) {
VirtualFileSystem::close_read_file(_stream);
}
} }
/** /**

1
panda/src/movies/flacAudioCursor.h
View File

@ -41,6 +41,7 @@ public:
protected: protected:
drflac *_drflac; drflac *_drflac;
std::istream *_stream;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {