History

avfilter/vf_photosensitivity: fix memleak

Paul B Mahol committed 7 years ago

Commit 056bc931 parent c888adf1 file · +6 −1Browse files

Unified · Split

libavfilter/vf_photosensitivity.c+6−1
@@ -220,6 +220,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 219 unmodified lines
220220 int this_badness, current_badness, fixed_badness, new_badness, i, res;
221221 PhotosensitivityFrame ef;
222222 AVFrame *src, *out;
223+ int free_in = 0;
223224 float factor;
224225 AVDictionary **metadata;
225226
@@ -270,12 +271,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 44 unmodified lines
270271 s->history[s->history_pos] = this_badness;
271272 }
272273 src = s->last_frame_av;
274+ free_in = 1;
273275 }
274276 s->history_pos = (s->history_pos + 1) % s->nb_frames;
275277
276278 out = ff_get_video_buffer(outlink, in->width, in->height);
277279 if (!out) {
278− av_frame_free(&in);
280+ if (free_in == 1)
281+ av_frame_free(&in);
279282 return AVERROR(ENOMEM);
280283 }
281284 av_frame_copy_props(out, in);
@@ -296,6 +299,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 14 unmodified lines
296299 av_dict_set(metadata, "lavfi.photosensitivity.factor", value, 0);
297300 }
298301 av_frame_copy(out, src);
302+ if (free_in == 1)
303+ av_frame_free(&in);
299304 return ff_filter_frame(outlink, out);
300305 }
301306

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