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

avcodec/elsdec: Fix memleaks

Browse Source 
Fixes: 6798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5135899701542912

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-04-25 01:54:17 +02:00
parent 144ce364cd
commit 0bd0401336
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/elsdec.c
View File

@ -271,7 +271,7 @@ void ff_els_decoder_init(ElsDecCtx *ctx, const uint8_t *in, size_t data_size)
void ff_els_decoder_uninit(ElsUnsignedRung *rung) void ff_els_decoder_uninit(ElsUnsignedRung *rung)
{ {
av_free(rung->rem_rung_list); av_freep(&rung->rem_rung_list);
} }
static int els_import_byte(ElsDecCtx *ctx) static int els_import_byte(ElsDecCtx *ctx)
@ -391,12 +391,10 @@ unsigned ff_els_decode_unsigned(ElsDecCtx *ctx, ElsUnsignedRung *ur)
if (ur->rung_list_size <= (ur->avail_index + 2) * sizeof(ElsRungNode)) { if (ur->rung_list_size <= (ur->avail_index + 2) * sizeof(ElsRungNode)) {
// remember rung_node position // remember rung_node position
ptrdiff_t pos = rung_node - ur->rem_rung_list; ptrdiff_t pos = rung_node - ur->rem_rung_list;
ur->rem_rung_list = av_realloc(ur->rem_rung_list, ctx->err = av_reallocp(&ur->rem_rung_list,
ur->rung_list_size + ur->rung_list_size +
RUNG_SPACE); RUNG_SPACE);
if (!ur->rem_rung_list) { if (ctx->err < 0) {
av_free(ur->rem_rung_list);
ctx->err = AVERROR(ENOMEM);
return 0; return 0;
} }
memset((uint8_t *) ur->rem_rung_list + ur->rung_list_size, 0, memset((uint8_t *) ur->rem_rung_list + ur->rung_list_size, 0,

1
libavcodec/g2meet.c
View File

@ -927,6 +927,7 @@ static int epic_jb_decode_tile(G2MContext *c, int tile_x, int tile_y,
if (c->ec.els_ctx.err != 0) { if (c->ec.els_ctx.err != 0) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"ePIC: couldn't decode transparency pixel!\n"); "ePIC: couldn't decode transparency pixel!\n");
ff_els_decoder_uninit(&c->ec.unsigned_rung);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }