44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
|
||
|
|
--- a/src/http/modules/ngx_http_mp4_module.c
|
||
|
|
+++ b/src/http/modules/ngx_http_mp4_module.c
|
||
|
|
@@ -3099,7 +3099,8 @@ static ngx_int_t
|
||
|
|
ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
|
||
|
|
ngx_http_mp4_trak_t *trak, ngx_uint_t start)
|
||
|
|
{
|
||
|
|
- uint32_t start_sample, chunk, samples, id, next_chunk, n,
|
||
|
|
+ uint64_t n;
|
||
|
|
+ uint32_t start_sample, chunk, samples, id, next_chunk,
|
||
|
|
prev_samples;
|
||
|
|
ngx_buf_t *data, *buf;
|
||
|
|
ngx_uint_t entries, target_chunk, chunk_samples;
|
||
|
|
@@ -3155,12 +3156,19 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4
|
||
|
|
|
||
|
|
next_chunk = ngx_mp4_get_32value(entry->chunk);
|
||
|
|
|
||
|
|
+ if (next_chunk < chunk) {
|
||
|
|
+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
|
||
|
|
+ "unordered mp4 stsc chunks in \"%s\"",
|
||
|
|
+ mp4->file.name.data);
|
||
|
|
+ return NGX_ERROR;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
ngx_log_debug5(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
|
||
|
|
"sample:%uD, chunk:%uD, chunks:%uD, "
|
||
|
|
"samples:%uD, id:%uD",
|
||
|
|
start_sample, chunk, next_chunk - chunk, samples, id);
|
||
|
|
|
||
|
|
- n = (next_chunk - chunk) * samples;
|
||
|
|
+ n = (uint64_t) (next_chunk - chunk) * samples;
|
||
|
|
|
||
|
|
if (start_sample < n) {
|
||
|
|
goto found;
|
||
|
|
@@ -3182,7 +3190,7 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4
|
||
|
|
"sample:%uD, chunk:%uD, chunks:%uD, samples:%uD",
|
||
|
|
start_sample, chunk, next_chunk - chunk, samples);
|
||
|
|
|
||
|
|
- n = (next_chunk - chunk) * samples;
|
||
|
|
+ n = (uint64_t) (next_chunk - chunk) * samples;
|
||
|
|
|
||
|
|
if (start_sample > n) {
|
||
|
|
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
|