highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mp3dec: properly allocate dummy AVCodecContext

Browse Source 
Fixes (harmless) use of uninitialized variable

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-26 19:59:44 +01:00
parent 51b7ab2ee7
commit 6ad42b3e15
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mp3dec.c
View File

@@ -61,7 +61,7 @@ static int mp3_read_probe(AVProbeData *p)
int fsize, frames; int fsize, frames;
uint32_t header; uint32_t header;
const uint8_t *buf, *buf0, *buf2, *end; const uint8_t *buf, *buf0, *buf2, *end;
AVCodecContext avctx; AVCodecContext *avctx = avcodec_alloc_context3(NULL);
buf0 = p->buf; buf0 = p->buf;
end = p->buf + p->buf_size - sizeof(uint32_t); end = p->buf + p->buf_size - sizeof(uint32_t);
@@ -79,7 +79,7 @@ static int mp3_read_probe(AVProbeData *p)
for(frames = 0; buf2 < end; frames++) { for(frames = 0; buf2 < end; frames++) {
int dummy; int dummy;
header = AV_RB32(buf2); header = AV_RB32(buf2);
fsize = avpriv_mpa_decode_header(&avctx, header, &dummy, &dummy, &dummy, &dummy); fsize = avpriv_mpa_decode_header(avctx, header, &dummy, &dummy, &dummy, &dummy);
if(fsize < 0) if(fsize < 0)
break; break;
buf2 += fsize; buf2 += fsize;
@@ -88,6 +88,7 @@ static int mp3_read_probe(AVProbeData *p)
if(buf == buf0) if(buf == buf0)
first_frames= frames; first_frames= frames;
} }
avcodec_free_context(&avctx);
// keep this in sync with ac3 probe, both need to avoid // keep this in sync with ac3 probe, both need to avoid
// issues with MPEG-files! // issues with MPEG-files!
if (first_frames>=4) return AVPROBE_SCORE_EXTENSION + 1; if (first_frames>=4) return AVPROBE_SCORE_EXTENSION + 1;