RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/3dostr: Check remaining buffer in probe before 8 byte step 

Fixes: segfault
Fixes: signal_sigabrt_7ffff6ae7cc9_7213_0d6457b9d6897fa7c78507fa5de53510.ts
Regression since: 3ac45bf665

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-09-19 00:11:59 +02:00
parent d54c24acde
commit 624f6df19f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/3dostr.c
View File

@ -29,10 +29,9 @@ static int threedostr_probe(const AVProbeData *p)
unsigned chunk = AV_RL32(p->buf + i); unsigned chunk = AV_RL32(p->buf + i);
unsigned size = AV_RB32(p->buf + i + 4); unsigned size = AV_RB32(p->buf + i + 4);
i += 8;
if (size < 8 || p->buf_size - i < size) if (size < 8 || p->buf_size - i < size)
return 0; return 0;
i += 8;
size -= 8; size -= 8;
switch (chunk) { switch (chunk) {
case MKTAG('C','T','R','L'): case MKTAG('C','T','R','L'):