[FFmpeg-devel] [PATCH 1/3] avcodec/utils: Fix off by 1 error causing unneeded allocation in ff_fast_malloc()

Benoit Fouet benoit.fouet at free.fr
Mon Sep 29 09:59:21 CEST 2014


Hi,

----- Mail original -----
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
>  libavcodec/utils.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index b27f918..9eb2b5b 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -122,7 +122,7 @@ static void *avformat_mutex;
>  static inline int ff_fast_malloc(void *ptr, unsigned int *size,
>  size_t min_size, int zero_realloc)
>  {
>      void **p = ptr;
> -    if (min_size < *size)
> +    if (min_size <= *size && *p)
>          return 0;
>      min_size = FFMAX(17 * min_size / 16 + 32, min_size);
>      av_free(*p);
> 

LGTM

-- 
Ben


More information about the ffmpeg-devel mailing list