virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

fftools/ffmpeg: Don't presume frame_queue to have been allocated

Browse Source 
Fixes segfaults upon allocation failure.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-02-23 20:11:51 +01:00
parent 88b02e5829
commit 6559858de9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fftools/ffmpeg.c
View File

@@ -527,11 +527,13 @@ static void ffmpeg_cleanup(int ret)
for (j = 0; j < fg->nb_inputs; j++) { for (j = 0; j < fg->nb_inputs; j++) {
InputFilter *ifilter = fg->inputs[j]; InputFilter *ifilter = fg->inputs[j];
struct InputStream *ist = ifilter->ist; struct InputStream *ist = ifilter->ist;
AVFrame *frame;
while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0) if (ifilter->frame_queue) {
av_frame_free(&frame); AVFrame *frame;
av_fifo_freep2(&ifilter->frame_queue); while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0)
av_frame_free(&frame);
av_fifo_freep2(&ifilter->frame_queue);
}
av_freep(&ifilter->displaymatrix); av_freep(&ifilter->displaymatrix);
if (ist->sub2video.sub_queue) { if (ist->sub2video.sub_queue) {
AVSubtitle sub; AVSubtitle sub;