Don't leak a single AVFrame when getting audio or video properties

vapoursynth · Sep 19, 2024 · 16fdf3e · 16fdf3e
1 parent 4f64f79
commit 16fdf3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/audiosource.cpp b/src/audiosource.cpp
@@ -214,14 +214,17 @@ void LWAudioDecoder::GetAudioProperties(BSAudioProperties &AP) {
         av_channel_layout_default(&ch, PropFrame->ch_layout.nb_channels);
         AP.ChannelLayout = ch.u.mask;
     } else {
+        av_frame_free(&PropFrame);
         throw BestSourceException("Ambisonics and custom channel orders not supported");
     }
 
     AP.NumSamples = (FormatContext->duration * PropFrame->sample_rate) / AV_TIME_BASE - FormatContext->streams[TrackNumber]->codecpar->initial_padding;
     if (PropFrame->pts != AV_NOPTS_VALUE)
         AP.StartTime = (static_cast<double>(FormatContext->streams[TrackNumber]->time_base.num) * PropFrame->pts) / FormatContext->streams[TrackNumber]->time_base.den;
 
-    if (AP.AF.Bits <= 0)
+    av_frame_free(&PropFrame);
+
+    if (AP.AF.Bits <= 0) //FIXME, can this still happen?
         throw BestSourceException("Codec returned zero size audio");
 }
 

diff --git a/src/videosource.cpp b/src/videosource.cpp
@@ -409,6 +409,8 @@ void LWVideoDecoder::GetVideoProperties(BSVideoProperties &VP) {
                 VP.Rotation += 360;
         }
     }
+
+    av_frame_free(&PropFrame);
 }
 
 AVFrame *LWVideoDecoder::GetNextFrame() {