Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch for release-1.20.1 #518

Open
wants to merge 1 commit into
base: origin-release-1.20.1-1733934027
Choose a base branch
from
Open

Patch for release-1.20.1 #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions src/http/modules/ngx_http_mp4_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,12 @@ ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
return NGX_ERROR;
}

if (mp4->ftyp_atom.buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 ftyp atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size;

ftyp_atom = ngx_palloc(mp4->request->pool, atom_size);
Expand Down Expand Up @@ -1128,6 +1134,12 @@ ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
return NGX_DECLINED;
}

if (mp4->moov_atom.buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 moov atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module);

if (atom_data_size > mp4->buffer_size) {
Expand Down Expand Up @@ -1195,6 +1207,12 @@ ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdat atom");

if (mp4->mdat_atom.buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 mdat atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

data = &mp4->mdat_data_buf;
data->file = &mp4->file;
data->in_file = 1;
Expand Down Expand Up @@ -1321,6 +1339,12 @@ ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mvhd atom");

if (mp4->mvhd_atom.buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 mvhd atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

atom_header = ngx_mp4_atom_header(mp4);
mvhd_atom = (ngx_mp4_mvhd_atom_t *) atom_header;
mvhd64_atom = (ngx_mp4_mvhd64_atom_t *) atom_header;
Expand Down Expand Up @@ -1586,6 +1610,13 @@ ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size;

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_TKHD_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 tkhd atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

trak->tkhd_size = atom_size;

ngx_mp4_set_32value(tkhd_atom->size, atom_size);
Expand Down Expand Up @@ -1624,6 +1655,12 @@ ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_MDIA_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 mdia atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

atom = &trak->mdia_atom_buf;
atom->temporary = 1;
atom->pos = atom_header;
Expand Down Expand Up @@ -1747,6 +1784,13 @@ ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size;

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 mdhd atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

trak->mdhd_size = atom_size;
trak->timescale = timescale;

Expand Down Expand Up @@ -1789,6 +1833,12 @@ ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_HDLR_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 hdlr atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

atom = &trak->hdlr_atom_buf;
atom->temporary = 1;
atom->pos = atom_header;
Expand Down Expand Up @@ -1817,6 +1867,12 @@ ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_MINF_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 minf atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

atom = &trak->minf_atom_buf;
atom->temporary = 1;
atom->pos = atom_header;
Expand Down Expand Up @@ -1860,6 +1916,15 @@ ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf
|| trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf)
{
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 vmhd/smhd atom in \"%s\"",
mp4->file.name.data);
return NGX_ERROR;
}

atom = &trak->vmhd_atom_buf;
atom->temporary = 1;
atom->pos = atom_header;
Expand Down Expand Up @@ -1891,6 +1956,15 @@ ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf
|| trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf)
{
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 vmhd/smhd atom in \"%s\"",
mp4->file.name.data);
return NGX_ERROR;
}

atom = &trak->smhd_atom_buf;
atom->temporary = 1;
atom->pos = atom_header;
Expand Down Expand Up @@ -1922,6 +1996,12 @@ ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_DINF_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 dinf atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

atom = &trak->dinf_atom_buf;
atom->temporary = 1;
atom->pos = atom_header;
Expand Down Expand Up @@ -1950,6 +2030,12 @@ ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_STBL_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 stbl atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

atom = &trak->stbl_atom_buf;
atom->temporary = 1;
atom->pos = atom_header;
Expand Down Expand Up @@ -2018,6 +2104,12 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_STSD_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 stsd atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

atom = &trak->stsd_atom_buf;
atom->temporary = 1;
atom->pos = atom_header;
Expand Down Expand Up @@ -2086,6 +2178,13 @@ ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t);

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_STTS_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 stts atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

trak->time_to_sample_entries = entries;

atom = &trak->stts_atom_buf;
Expand Down Expand Up @@ -2291,6 +2390,13 @@ ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
"sync sample entries:%uD", entries);

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_STSS_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 stss atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

trak->sync_samples_entries = entries;

atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t);
Expand Down Expand Up @@ -2489,6 +2595,13 @@ ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
"composition offset entries:%uD", entries);

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 ctts atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

trak->composition_offset_entries = entries;

atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t);
Expand Down Expand Up @@ -2692,6 +2805,13 @@ ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t);

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_STSC_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 stsc atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

trak->sample_to_chunk_entries = entries;

atom = &trak->stsc_atom_buf;
Expand Down Expand Up @@ -3024,6 +3144,13 @@ ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
"sample uniform size:%uD, entries:%uD", size, entries);

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 stsz atom in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}

trak->sample_sizes_entries = entries;

atom_table = atom_header + sizeof(ngx_mp4_stsz_atom_t);
Expand Down Expand Up @@ -3207,6 +3334,16 @@ ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
atom_end = atom_table + entries * sizeof(uint32_t);

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf
|| trak->out[NGX_HTTP_MP4_CO64_ATOM].buf)
{
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 stco/co64 atom in \"%s\"",
mp4->file.name.data);
return NGX_ERROR;
}

trak->chunks = entries;

atom = &trak->stco_atom_buf;
Expand Down Expand Up @@ -3413,6 +3550,16 @@ ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
atom_end = atom_table + entries * sizeof(uint64_t);

trak = ngx_mp4_last_trak(mp4);

if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf
|| trak->out[NGX_HTTP_MP4_CO64_ATOM].buf)
{
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"duplicate mp4 stco/co64 atom in \"%s\"",
mp4->file.name.data);
return NGX_ERROR;
}

trak->chunks = entries;

atom = &trak->co64_atom_buf;
Expand Down
Loading