diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-09-14 16:28:32 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-27 07:20:57 +0100 |
| commit | 140d871e0873c538b41a29be81b9400dc71f231c (patch) | |
| tree | de875383ebe4a48c82a3db79056c77cb77343fb8 | |
| parent | 5000bae8305950f0412df240fb17f1f48c8f7590 (diff) | |
| download | ffmpeg-140d871e0873c538b41a29be81b9400dc71f231c.tar.gz | |
avcodec/flashsvenc: Avoid allocation of buffer, fix memleak
Up until now, the flashsv encoder tried to allocate two buffers in its
init function; if only one of these allocations succeeds, the other
buffer leaks. Fix this by making one of these buffers part of the
context (its size is a compile-time constant).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit ec6f4c51586cc213d16749f930970ba8afd0e38a)
| -rw-r--r-- | libavcodec/flashsvenc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index f7f98efde3..4ac643c036 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -59,11 +59,11 @@ typedef struct FlashSVContext { uint8_t *previous_frame; int image_width, image_height; int block_width, block_height; - uint8_t *tmpblock; uint8_t *encbuffer; int block_size; z_stream zstream; int last_key_frame; + uint8_t tmpblock[3 * 256 * 256]; } FlashSVContext; static int copy_region_enc(uint8_t *sptr, uint8_t *dptr, int dx, int dy, @@ -96,7 +96,6 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx) av_freep(&s->encbuffer); av_freep(&s->previous_frame); - av_freep(&s->tmpblock); return 0; } @@ -121,10 +120,9 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx) s->image_width = avctx->width; s->image_height = avctx->height; - s->tmpblock = av_mallocz(3 * 256 * 256); s->encbuffer = av_mallocz(s->image_width * s->image_height * 3); - if (!s->tmpblock || !s->encbuffer) { + if (!s->encbuffer) { av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); return AVERROR(ENOMEM); } |