virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/flashsvenc: Avoid allocation of buffer, fix memleak

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt 2020-09-14 16:28:32 +02:00
parent cdc4c268e2
commit ec6f4c5158
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/flashsvenc.c
View File

@ -59,11 +59,11 @@ typedef struct FlashSVContext {
uint8_t *previous_frame; uint8_t *previous_frame;
int image_width, image_height; int image_width, image_height;
int block_width, block_height; int block_width, block_height;
uint8_t *tmpblock;
uint8_t *encbuffer; uint8_t *encbuffer;
int block_size; int block_size;
z_stream zstream; z_stream zstream;
int last_key_frame; int last_key_frame;
uint8_t tmpblock[3 * 256 * 256];
} FlashSVContext; } FlashSVContext;
static int copy_region_enc(uint8_t *sptr, uint8_t *dptr, int dx, int dy, 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->encbuffer);
av_freep(&s->previous_frame); av_freep(&s->previous_frame);
av_freep(&s->tmpblock);
return 0; return 0;
} }
@ -121,10 +120,9 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx)
s->image_width = avctx->width; s->image_width = avctx->width;
s->image_height = avctx->height; s->image_height = avctx->height;
s->tmpblock = av_mallocz(3 * 256 * 256);
s->encbuffer = av_mallocz(s->image_width * s->image_height * 3); 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"); av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }