]> git.kaiwu.me - nginx.git/commitdiff
Mp4: fixed handling of too small mdat atoms (ticket #266).
authorMaxim Dounin <mdounin@mdounin.ru>
Mon, 4 Mar 2013 15:39:03 +0000 (15:39 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Mon, 4 Mar 2013 15:39:03 +0000 (15:39 +0000)
Patch by Gernot Vormayr (with minor changes).

src/http/modules/ngx_http_mp4_module.c

index b864858eac6358cd643ad0892323e6f8a50bcb31..20ef51af2b648c5a97a2ff78b3609d01d0aca3d6 100644 (file)
@@ -754,6 +754,13 @@ ngx_http_mp4_process(ngx_http_mp4_file_t *mp4)
 
     *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;