Re: [FFmpeg-devel] [PATCH] omx: Fix OOM check

2016-12-05 Thread Andreas Cadhalpun
On 05.12.2016 18:49, Timothy Gu wrote:
> Also use av_mallocz_array().
> 
> Fixes CID1396839.
> ---
>  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));

This is not really related, but probably OK.

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

This looks good.

Best regards,
Andreas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH] omx: Fix OOM check

2016-12-05 Thread Timothy Gu
Also use av_mallocz_array().

Fixes CID1396839.
---
 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;
 }
-- 
2.10.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel