mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/zmbvenc: Fix memleak upon init error
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
e51fad097b
commit
141f3053ba
|
@ -74,6 +74,7 @@ typedef struct ZmbvEncContext {
|
||||||
int keyint, curfrm;
|
int keyint, curfrm;
|
||||||
int bypp;
|
int bypp;
|
||||||
enum ZmbvFormat fmt;
|
enum ZmbvFormat fmt;
|
||||||
|
int zlib_init_ok;
|
||||||
z_stream zstream;
|
z_stream zstream;
|
||||||
|
|
||||||
int score_tab[ZMBV_BLOCK * ZMBV_BLOCK * 4 + 1];
|
int score_tab[ZMBV_BLOCK * ZMBV_BLOCK * 4 + 1];
|
||||||
|
@ -305,8 +306,9 @@ static av_cold int encode_end(AVCodecContext *avctx)
|
||||||
av_freep(&c->comp_buf);
|
av_freep(&c->comp_buf);
|
||||||
av_freep(&c->work_buf);
|
av_freep(&c->work_buf);
|
||||||
|
|
||||||
deflateEnd(&c->zstream);
|
|
||||||
av_freep(&c->prev_buf);
|
av_freep(&c->prev_buf);
|
||||||
|
if (c->zlib_init_ok)
|
||||||
|
deflateEnd(&c->zstream);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -376,8 +378,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
|
||||||
return AVERROR(EINVAL);
|
return AVERROR(EINVAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Needed if zlib unused or init aborted before deflateInit
|
|
||||||
memset(&c->zstream, 0, sizeof(z_stream));
|
|
||||||
c->comp_size = avctx->width * c->bypp * avctx->height + 1024 +
|
c->comp_size = avctx->width * c->bypp * avctx->height + 1024 +
|
||||||
((avctx->width + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * ((avctx->height + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * 2 + 4;
|
((avctx->width + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * ((avctx->height + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * 2 + 4;
|
||||||
if (!(c->work_buf = av_malloc(c->comp_size))) {
|
if (!(c->work_buf = av_malloc(c->comp_size))) {
|
||||||
|
@ -419,6 +419,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
|
||||||
av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
|
av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
c->zlib_init_ok = 1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -441,4 +442,5 @@ const AVCodec ff_zmbv_encoder = {
|
||||||
#endif //ZMBV_ENABLE_24BPP
|
#endif //ZMBV_ENABLE_24BPP
|
||||||
AV_PIX_FMT_BGR0,
|
AV_PIX_FMT_BGR0,
|
||||||
AV_PIX_FMT_NONE },
|
AV_PIX_FMT_NONE },
|
||||||
|
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue