ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Dec 7 02:46:25 2014 +0100| [eb74839caa2c50018b1d5a88a43c3da9f4345a8d] | committer: Michael Niedermayer
avutil/opt: Check av_parse_color() return value Fixes: CID1257007 Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb74839caa2c50018b1d5a88a43c3da9f4345a8d --- libavutil/opt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index d873bd2..e43b5d8 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1816,8 +1816,10 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o) return !av_cmp_q(*(AVRational*)dst, q); case AV_OPT_TYPE_COLOR: { uint8_t color[4] = {0, 0, 0, 0}; - if (o->default_val.str) - av_parse_color(color, o->default_val.str, -1, NULL); + if (o->default_val.str) { + if ((ret = av_parse_color(color, o->default_val.str, -1, NULL)) < 0) + return ret; + } return !memcmp(color, dst, sizeof(color)); } default: _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
