commit b502fcb37a1a8cd1a79d43d5f3d215a933c372d9
author Maxim Dounin <mdounin@mdounin.ru> Mon Mar 04 15:39:03 2013 +0000
committer Maxim Dounin <mdounin@mdounin.ru> Mon Mar 04 15:39:03 2013 +0000
tree b072ddad079373fad253a079db6805764d9a7707
parent fcf003c6f4a5a7c885de0befcd45f4acddefb47b

Mp4: fixed handling of too small mdat atoms (ticket #266).

Patch by Gernot Vormayr (with minor changes).

src/http/modules/ngx_http_mp4_module.c

diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index b864858..20ef51a 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -754,6 +754,13 @@
 
     *prev = &mp4->mdat_atom;
 
+    if (start_offset > mp4->mdat_data.buf->file_last) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "start time is out mp4 mdat atom in \"%s\"",
+                      mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     adjustment = mp4->ftyp_size + mp4->moov_size
                  + ngx_http_mp4_update_mdat_atom(mp4, start_offset)
                  - start_offset;