[FFmpeg-devel] [PATCH] avcodec/imgconvert: fix possible null pointer dereference

[Paul B Mahol]

On 4/3/18, Simon Thelen <ffmpeg-dev at c-14.de> wrote:
> regression since 354b26a3945eadd4ed8fcd801dfefad2566241de
> ---
>  libavcodec/imgconvert.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
> index 7b0005b308..1fd636c83d 100644
> --- a/libavcodec/imgconvert.c
> +++ b/libavcodec/imgconvert.c
> @@ -72,11 +72,12 @@ enum AVPixelFormat
> avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p
>      int loss;
>
>      for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) {
> -        loss = *loss_ptr;
> +        loss = loss_ptr ? *loss_ptr : 0;
>          best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i],
> src_pix_fmt, has_alpha, &loss);
>      }
>
> -    *loss_ptr = loss;
> +    if (loss_ptr)
> +        *loss_ptr = loss;
>      return best;
>  }
>
> --
> 2.16.3
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

applied