[FFmpeg-cvslog] vf_colorspace: Check av_frame_copy_props() return value
Vittorio Giovara
git at videolan.org
Sat Aug 27 14:12:36 EEST 2016
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Thu Aug 25 19:14:57 2016 -0400| [6648da359114696351db7e7468f0769a7d61c387] | committer: Michael Niedermayer
vf_colorspace: Check av_frame_copy_props() return value
This function can potentially allocate memory.
Reviewed-by: "Ronald S. Bultje" <rsbultje at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6648da359114696351db7e7468f0769a7d61c387
---
libavfilter/vf_colorspace.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index 3d39f13..bf51c83 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -861,7 +861,11 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
av_frame_free(&in);
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 ?
default_prm[FFMIN(s->user_all, CS_NB)] : s->user_prm;
More information about the ffmpeg-cvslog
mailing list