highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

omx: Fix OOM check

Browse Source 
Also use av_mallocz_array().

Fixes CID1396839.

(cherry picked from commit 16a75304fe42d3a007c78126b6370c94ccf891f6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Timothy Gu 2016-12-05 09:24:47 -08:00 committed by Michael Niedermayer
parent 987675ba0d
commit 6522a5dcf0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/omx.c
View File

@ -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;
}