From ee09ffbfd2f744e796d6289523f396d830c025a3 Mon Sep 17 00:00:00 2001
From: erankor <eran.kornblau@kaltura.com>
Date: Wed, 13 Jun 2018 11:48:20 +0300
Subject: [PATCH] qt-faststart: add validation on ftyp atom size
avoid trying to allocate an unreasonably sized buffer on corrupt files
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
tools/qt-faststart.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c
index d0ae7245f30..9446c11f80c 100644
--- a/tools/qt-faststart.c
+++ b/tools/qt-faststart.c
@@ -84,6 +84,7 @@
#define ATOM_PREAMBLE_SIZE 8
#define COPY_BUFFER_SIZE 33554432
+#define MAX_FTYP_ATOM_SIZE 1048576
int main(int argc, char *argv[])
{
@@ -133,6 +134,11 @@ int main(int argc, char *argv[])
/* keep ftyp atom */
if (atom_type == FTYP_ATOM) {
+ if (atom_size > MAX_FTYP_ATOM_SIZE) {
+ printf("ftyp atom size %"PRIu64" too big\n",
+ atom_size);
+ goto error_out;
+ }
ftyp_atom_size = atom_size;
free(ftyp_atom);
ftyp_atom = malloc(ftyp_atom_size);
--
GitLab