virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mscc: Use ff_inflate_init/end()

Browse Source 
This fixes the problem of potentially closing a z_stream
that has never been successfully initialized.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-03-15 12:27:32 +01:00
parent 4960c62944
commit 7fffa718c3
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -2883,7 +2883,7 @@ mpeg2video_encoder_select="mpegvideoenc h263dsp"
mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_decoder_select="h263_decoder mpeg4video_parser"
mpeg4_encoder_select="h263_encoder" mpeg4_encoder_select="h263_encoder"
msa1_decoder_select="mss34dsp" msa1_decoder_select="mss34dsp"
mscc_decoder_deps="zlib" mscc_decoder_select="inflate_wrapper"
msmpeg4v1_decoder_select="h263_decoder" msmpeg4v1_decoder_select="h263_decoder"
msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_decoder_select="h263_decoder"
msmpeg4v2_encoder_select="h263_encoder" msmpeg4v2_encoder_select="h263_encoder"
@@ -2935,7 +2935,7 @@ sonic_ls_encoder_select="golomb rangecoder"
sp5x_decoder_select="mjpeg_decoder" sp5x_decoder_select="mjpeg_decoder"
speedhq_decoder_select="mpegvideo" speedhq_decoder_select="mpegvideo"
speedhq_encoder_select="mpegvideoenc" speedhq_encoder_select="mpegvideoenc"
srgc_decoder_deps="zlib" srgc_decoder_select="inflate_wrapper"
svq1_decoder_select="hpeldsp" svq1_decoder_select="hpeldsp"
svq1_encoder_select="hpeldsp me_cmp mpegvideoenc" svq1_encoder_select="hpeldsp me_cmp mpegvideoenc"
svq3_decoder_select="golomb h264dsp h264parse h264pred hpeldsp tpeldsp videodsp" svq3_decoder_select="golomb h264dsp h264parse h264pred hpeldsp tpeldsp videodsp"

33
libavcodec/mscc.c
View File

@@ -27,6 +27,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "internal.h" #include "internal.h"
#include "zlib_wrapper.h"
#include <zlib.h> #include <zlib.h>
@@ -36,7 +37,7 @@ typedef struct MSCCContext {
uint8_t *decomp_buf; uint8_t *decomp_buf;
unsigned int uncomp_size; unsigned int uncomp_size;
uint8_t *uncomp_buf; uint8_t *uncomp_buf;
z_stream zstream; FFZStream zstream;
uint32_t pal[256]; uint32_t pal[256];
} MSCCContext; } MSCCContext;
@@ -132,6 +133,7 @@ static int decode_frame(AVCodecContext *avctx,
AVPacket *avpkt) AVPacket *avpkt)
{ {
MSCCContext *s = avctx->priv_data; MSCCContext *s = avctx->priv_data;
z_stream *const zstream = &s->zstream.zstream;
AVFrame *frame = data; AVFrame *frame = data;
uint8_t *buf = avpkt->data; uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
@@ -166,22 +168,22 @@ static int decode_frame(AVCodecContext *avctx,
memcpy(frame->data[1], s->pal, AVPALETTE_SIZE); memcpy(frame->data[1], s->pal, AVPALETTE_SIZE);
} }
ret = inflateReset(&s->zstream); ret = inflateReset(zstream);
if (ret != Z_OK) { if (ret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret); av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret);
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
s->zstream.next_in = buf; zstream->next_in = buf;
s->zstream.avail_in = buf_size; zstream->avail_in = buf_size;
s->zstream.next_out = s->decomp_buf; zstream->next_out = s->decomp_buf;
s->zstream.avail_out = s->decomp_size; zstream->avail_out = s->decomp_size;
ret = inflate(&s->zstream, Z_FINISH); ret = inflate(zstream, Z_FINISH);
if (ret != Z_STREAM_END) { if (ret != Z_STREAM_END) {
av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", ret); av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", ret);
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
bytestream2_init(&gb, s->decomp_buf, s->zstream.total_out); bytestream2_init(&gb, s->decomp_buf, zstream->total_out);
bytestream2_init_writer(&pb, s->uncomp_buf, s->uncomp_size); bytestream2_init_writer(&pb, s->uncomp_buf, s->uncomp_size);
ret = rle_uncompress(avctx, &gb, &pb); ret = rle_uncompress(avctx, &gb, &pb);
@@ -204,7 +206,7 @@ static int decode_frame(AVCodecContext *avctx,
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
{ {
MSCCContext *s = avctx->priv_data; MSCCContext *s = avctx->priv_data;
int stride, zret; int stride;
switch (avctx->bits_per_coded_sample) { switch (avctx->bits_per_coded_sample) {
case 8: avctx->pix_fmt = AV_PIX_FMT_PAL8; break; case 8: avctx->pix_fmt = AV_PIX_FMT_PAL8; break;
@@ -227,16 +229,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (!(s->uncomp_buf = av_malloc(s->uncomp_size))) if (!(s->uncomp_buf = av_malloc(s->uncomp_size)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->zstream.zalloc = Z_NULL; return ff_inflate_init(&s->zstream, avctx);
s->zstream.zfree = Z_NULL;
s->zstream.opaque = Z_NULL;
zret = inflateInit(&s->zstream);
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
return AVERROR_UNKNOWN;
}
return 0;
} }
static av_cold int decode_close(AVCodecContext *avctx) static av_cold int decode_close(AVCodecContext *avctx)
@@ -247,7 +240,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
s->decomp_size = 0; s->decomp_size = 0;
av_freep(&s->uncomp_buf); av_freep(&s->uncomp_buf);
s->uncomp_size = 0; s->uncomp_size = 0;
inflateEnd(&s->zstream); ff_inflate_end(&s->zstream);
return 0; return 0;
} }