ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/4xm: Cleanup on GET_LIST_HEADER() failure

Browse Source 
Fixes: memleak
Fixes: 23142/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5932860820422656

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a5313ce654)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-06-07 21:35:43 +02:00
parent 0ef01e368c
commit 53c685afde
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/4xm.c
View File

@ -58,8 +58,10 @@
#define GET_LIST_HEADER() \
fourcc_tag = avio_rl32(pb); \
size = avio_rl32(pb); \
if (fourcc_tag != LIST_TAG) \
return AVERROR_INVALIDDATA; \
if (fourcc_tag != LIST_TAG) { \
ret = AVERROR_INVALIDDATA; \
goto fail; \
} \
fourcc_tag = avio_rl32(pb);
typedef struct AudioTrack {
@ -201,7 +203,7 @@ static int fourxm_read_header(AVFormatContext *s)
unsigned int size;
int header_size;
FourxmDemuxContext *fourxm = s->priv_data;
unsigned char *header;
unsigned char *header = NULL;
int i, ret;
fourxm->track_count = 0;