[FFmpeg-devel] [PATCH 2/3] avcodec/mjpegdec: Check initializing Huffman tables

[Michael Niedermayer]

On Sat, Apr 03, 2021 at 04:22:26PM +0200, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
> Is it actually intended that the decoder tries to use external Huffman
> tables purely based on the value of the option, even when there is no
> extradata at all (in which case init_get_bits() fails)?
> 
>  libavcodec/mjpegdec.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
> index 776797d35b..d0c933b52e 100644
> --- a/libavcodec/mjpegdec.c
> +++ b/libavcodec/mjpegdec.c
> @@ -154,7 +154,8 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
>          if (ff_mjpeg_decode_dht(s)) {
>              av_log(avctx, AV_LOG_ERROR,
>                     "error using external huffman table, switching back to internal\n");
> -            init_default_huffman_tables(s);
> +            if ((ret = init_default_huffman_tables(s)) < 0)
> +                return ret;
>          }
>      }
>      if (avctx->field_order == AV_FIELD_BB) { /* quicktime icefloe 019 */

probably ok

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Rewriting code that is poorly written but fully understood is good.
Rewriting code that one doesnt understand is a sign that one is less smart
than the original author, trying to rewrite it will not make it better.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20210403/dabd37f8/attachment.sig>