ffmpeg | branch: master | Timothy Gu <timothyg...@gmail.com> | Mon Dec 5 09:24:47 2016 -0800| [16a75304fe42d3a007c78126b6370c94ccf891f6] | committer: Timothy Gu
omx: Fix OOM check Also use av_mallocz_array(). Fixes CID1396839. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16a75304fe42d3a007c78126b6370c94ccf891f6 --- libavcodec/omx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index c1b6fb9..b5093f4 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -352,12 +352,12 @@ static av_cold int find_component(OMXContext *omx_context, void *logctx, av_log(logctx, AV_LOG_WARNING, "No component for role %s found\n", role); return AVERROR_ENCODER_NOT_FOUND; } - components = av_mallocz(sizeof(char*) * num); + components = av_mallocz_array(num, sizeof(*components)); if (!components) return AVERROR(ENOMEM); for (i = 0; i < num; i++) { components[i] = av_mallocz(OMX_MAX_STRINGNAME_SIZE); - if (!components) { + if (!components[i]) { ret = AVERROR(ENOMEM); goto end; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
