Commit 6648da35 authored by Vittorio Giovara's avatar Vittorio Giovara Committed by Michael Niedermayer

vf_colorspace: Check av_frame_copy_props() return value

This function can potentially allocate memory.
Reviewed-by: 's avatar"Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent c7527331
...@@ -861,7 +861,11 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) ...@@ -861,7 +861,11 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
av_frame_free(&in); av_frame_free(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
av_frame_copy_props(out, in); res = av_frame_copy_props(out, in);
if (res < 0) {
av_frame_free(&in);
return res;
}
out->color_primaries = s->user_prm == AVCOL_PRI_UNSPECIFIED ? out->color_primaries = s->user_prm == AVCOL_PRI_UNSPECIFIED ?
default_prm[FFMIN(s->user_all, CS_NB)] : s->user_prm; default_prm[FFMIN(s->user_all, CS_NB)] : s->user_prm;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment