Mercurial > hg > nginx

changeset 5097:37671d0042b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mp4: fixed handling of too small mdat atoms (ticket #266). Patch by Gernot Vormayr (with minor changes).
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 04 Mar 2013 15:39:03 +0000
parents 63014d919fec
children e04428778567
files src/http/modules/ngx_http_mp4_module.c
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -754,6 +754,13 @@ ngx_http_mp4_process(ngx_http_mp4_file_t
 
     *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;