[nginx] svn commit: r5098 - trunk/src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-03-04 15:39:03 +0000 (Mon, 04 Mar 2013)
New Revision: 5098
URL: http://trac.nginx.org/nginx/changeset/5098/nginx

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

Patch by Gernot Vormayr (with minor changes).


Modified:
   trunk/src/http/modules/ngx_http_mp4_module.c

Modified: trunk/src/http/modules/ngx_http_mp4_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_mp4_module.c	2013-03-01 14:55:42 UTC (rev 5097)
+++ trunk/src/http/modules/ngx_http_mp4_module.c	2013-03-04 15:39:03 UTC (rev 5098)
@@ -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;