ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Wed May 5 20:36:44 2021 +0200| [54cb70594da4b9a35885053fd8738040f447003d] | committer: Andreas Rheinhardt
avcodec/tscc: Don't free uninitialized z_stream It is not documented to be safe to call inflateEnd() on a z_stream that has not been successfully initialized via inflateInit(); so record whether it has been successfully initialized. Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54cb70594da4b9a35885053fd8738040f447003d --- libavcodec/tscc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 043d78d018..e1a075faa7 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -57,6 +57,7 @@ typedef struct TsccContext { unsigned char* decomp_buf; GetByteContext gb; int height; + int zlib_init_ok; z_stream zstream; uint32_t pal[256]; @@ -128,8 +129,6 @@ static av_cold int decode_init(AVCodecContext *avctx) c->height = avctx->height; - // Needed if zlib unused or init aborted before inflateInit - memset(&c->zstream, 0, sizeof(z_stream)); switch(avctx->bits_per_coded_sample){ case 8: avctx->pix_fmt = AV_PIX_FMT_PAL8; break; case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555; break; @@ -160,6 +159,7 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return AVERROR_UNKNOWN; } + c->zlib_init_ok = 1; c->frame = av_frame_alloc(); if (!c->frame) @@ -175,7 +175,8 @@ static av_cold int decode_end(AVCodecContext *avctx) av_freep(&c->decomp_buf); av_frame_free(&c->frame); - inflateEnd(&c->zstream); + if (c->zlib_init_ok) + inflateEnd(&c->zstream); return 0; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
