flac: fix leak; properly close stream upon closing FlacAudioCursor

rdb · rdb · commit 5dd0db300b78 · 2018-11-27T20:59:51.000+01:00
diff --git a/panda/src/movies/flacAudioCursor.cxx b/panda/src/movies/flacAudioCursor.cxx
@@ -59,7 +59,8 @@ FlacAudioCursor::
 FlacAudioCursor(FlacAudio *src, std::istream *stream) :
   MovieAudioCursor(src),
   _is_valid(false),
-  _drflac(nullptr)
+  _drflac(nullptr),
+  _stream(stream)
 {
   nassertv(stream != nullptr);
   nassertv(stream->good());
@@ -91,6 +92,9 @@ FlacAudioCursor::
   if (_drflac != nullptr) {
     drflac_close(_drflac);
   }
+  if (_stream != nullptr) {
+    VirtualFileSystem::close_read_file(_stream);
+  }
 }
 
 /**
diff --git a/panda/src/movies/flacAudioCursor.h b/panda/src/movies/flacAudioCursor.h
@@ -41,6 +41,7 @@ class EXPCL_PANDA_MOVIES FlacAudioCursor : public MovieAudioCursor {
 
 protected:
   drflac *_drflac;
+  std::istream *_stream;
 
 public:
   static TypeHandle get_class_type() {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ FlacAudioCursor::`
`59`	`59`	`FlacAudioCursor(FlacAudio src, std::istream stream) :`
`60`	`60`	`MovieAudioCursor(src),`
`61`	`61`	`_is_valid(false),`
`62`		`- _drflac(nullptr)`
	`62`	`+ _drflac(nullptr),`
	`63`	`+ _stream(stream)`
`63`	`64`	`{`
`64`	`65`	`nassertv(stream != nullptr);`
`65`	`66`	`nassertv(stream->good());`
`@@ -91,6 +92,9 @@ FlacAudioCursor::`
`91`	`92`	`if (_drflac != nullptr) {`
`92`	`93`	`drflac_close(_drflac);`
`93`	`94`	`}`
	`95`	`+ if (_stream != nullptr) {`
	`96`	`+ VirtualFileSystem::close_read_file(_stream);`
	`97`	`+ }`
`94`	`98`	`}`
`95`	`99`
`96`	`100`	`/**`