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

mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail

Browse Source 
The first check is done without the AVIOContext, so alloc it only if said check succeeds

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2015-06-08 17:39:38 -03:00
parent d5a645625d
commit 1382add59d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mpjpegdec.c
View File

@@ -83,13 +83,13 @@ static int mpjpeg_read_probe(AVProbeData *p)
char line[128] = { 0 }; char line[128] = { 0 };
int ret = 0; int ret = 0;
if (p->buf_size < 2 || p->buf[0] != '-' || p->buf[1] != '-')
return 0;
pb = avio_alloc_context(p->buf, p->buf_size, 0, NULL, NULL, NULL, NULL); pb = avio_alloc_context(p->buf, p->buf_size, 0, NULL, NULL, NULL, NULL);
if (!pb) if (!pb)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (p->buf_size < 2 || p->buf[0] != '-' || p->buf[1] != '-')
goto end;
while (!pb->eof_reached) { while (!pb->eof_reached) {
ret = get_line(pb, line, sizeof(line)); ret = get_line(pb, line, sizeof(line));
if (ret < 0) if (ret < 0)
@@ -101,7 +101,6 @@ static int mpjpeg_read_probe(AVProbeData *p)
break; break;
} }
} }
end:
av_free(pb); av_free(pb);