virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/g2meet: Replace fake allocation avoidance for framebuf

Browse Source 
framebuf is only allocated when the new width/height are larger than the old
but nothing sets the old so its always allocated.
Use av_fast_mallocz() instead.

Fixes: Timeout
Fixes: 55094/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5116909932904448

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 38adbc6eeb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-01-24 22:48:46 +01:00
parent dc530f258c
commit 99bab6e961
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/g2meet.c
View File

@ -143,7 +143,8 @@ typedef struct G2MContext {
int got_header; int got_header;
uint8_t *framebuf; uint8_t *framebuf;
int framebuf_stride, old_width, old_height; int framebuf_stride;
unsigned int framebuf_allocated;
uint8_t *synth_tile, *jpeg_tile, *epic_buf, *epic_buf_base; uint8_t *synth_tile, *jpeg_tile, *epic_buf, *epic_buf_base;
int tile_stride, epic_buf_stride, old_tile_w, old_tile_h; int tile_stride, epic_buf_stride, old_tile_w, old_tile_h;
@ -1179,14 +1180,13 @@ static int g2m_init_buffers(G2MContext *c)
{ {
int aligned_height; int aligned_height;
if (!c->framebuf || c->old_width < c->width || c->old_height < c->height) { c->framebuf_stride = FFALIGN(c->width + 15, 16) * 3;
c->framebuf_stride = FFALIGN(c->width + 15, 16) * 3; aligned_height = c->height + 15;
aligned_height = c->height + 15;
av_free(c->framebuf); av_fast_mallocz(&c->framebuf, &c->framebuf_allocated, c->framebuf_stride * aligned_height);
c->framebuf = av_mallocz_array(c->framebuf_stride, aligned_height); if (!c->framebuf)
if (!c->framebuf) return AVERROR(ENOMEM);
return AVERROR(ENOMEM);
}
if (!c->synth_tile || !c->jpeg_tile || if (!c->synth_tile || !c->jpeg_tile ||
(c->compression == 2 && !c->epic_buf_base) || (c->compression == 2 && !c->epic_buf_base) ||
c->old_tile_w < c->tile_width || c->old_tile_w < c->tile_width ||
@ -1638,6 +1638,7 @@ static av_cold int g2m_decode_end(AVCodecContext *avctx)
av_freep(&c->jpeg_tile); av_freep(&c->jpeg_tile);
av_freep(&c->cursor); av_freep(&c->cursor);
av_freep(&c->framebuf); av_freep(&c->framebuf);
c->framebuf_allocated = 0;
return 0; return 0;
} }