History

avfilter/vf_decimate: fix memory leaks

Fixes #8311

Paul B Mahol committed 7 years ago

Commit c8f39151 parent 723d69f1 file · +10 −0Browse files

Unified · Split

libavfilter/vf_decimate.c+10−0
@@ -217,11 +217,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 216 unmodified lines
217217 av_frame_free(&dm->queue[i].frame);
218218 } else {
219219 AVFrame *frame = dm->queue[i].frame;
220+ dm->queue[i].frame = NULL;
220221 if (frame->pts != AV_NOPTS_VALUE && dm->start_pts == AV_NOPTS_VALUE)
221222 dm->start_pts = frame->pts;
222223 if (dm->ppsrc) {
223224 av_frame_free(&frame);
224225 frame = dm->clean_src[i];
226+ dm->clean_src[i] = NULL;
225227 }
226228 frame->pts = av_rescale_q(outlink->frame_count_in, dm->ts_unit, (AVRational){1,1}) +
227229 (dm->start_pts == AV_NOPTS_VALUE ? 0 : dm->start_pts);
@@ -314,7 +316,15 @@ static av_cold void decimate_uninit(AVFilterContext *ctx) · 86 unmodified lines
314316
315317 av_frame_free(&dm->last);
316318 av_freep(&dm->bdiffs);
319+ if (dm->queue) {
320+ for (i = 0; i < dm->cycle; i++)
321+ av_frame_free(&dm->queue[i].frame);
322+ }
317323 av_freep(&dm->queue);
324+ if (dm->clean_src) {
325+ for (i = 0; i < dm->cycle; i++)
326+ av_frame_free(&dm->clean_src[i]);
327+ }
318328 av_freep(&dm->clean_src);
319329 for (i = 0; i < ctx->nb_inputs; i++)
320330 av_freep(&ctx->input_pads[i].name);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t