har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/3dostr: make probing more robust

Browse Source
This commit is contained in:
Paul B Mahol 2020-09-17 23:19:18 +02:00
parent fe3a57f4ca
commit 3ac45bf665
1 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libavformat/3dostr.c
View File

@ -19,17 +19,57 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
static int threedostr_probe(const AVProbeData *p) static int threedostr_probe(const AVProbeData *p)
{ {
if (memcmp(p->buf, "CTRL", 4) && for (int i = 0; i < p->buf_size;) {
memcmp(p->buf, "SHDR", 4) && unsigned chunk = AV_RL32(p->buf + i);
memcmp(p->buf, "SNDS", 4)) unsigned size = AV_RB32(p->buf + i + 4);
i += 8;
if (size < 8 || p->buf_size - i < size)
return 0; return 0;
return AVPROBE_SCORE_MAX / 3 * 2; size -= 8;
switch (chunk) {
case MKTAG('C','T','R','L'):
break;
case MKTAG('S','N','D','S'):
if (size < 56)
return 0;
i += 8;
if (AV_RL32(p->buf + i) != MKTAG('S','H','D','R'))
return 0;
i += 28;
if (AV_RB32(p->buf + i) <= 0)
return 0;
i += 4;
if (AV_RB32(p->buf + i) <= 0)
return 0;
i += 4;
if (AV_RL32(p->buf + i) == MKTAG('S','D','X','2'))
return AVPROBE_SCORE_MAX;
else
return 0;
break;
case MKTAG('S','H','D','R'):
if (size > 0x78) {
i += 0x78;
size -= 0x78;
}
break;
default:
break;
}
i += size;
}
return 0;
} }
static int threedostr_read_header(AVFormatContext *s) static int threedostr_read_header(AVFormatContext *s)