breeze/Bento4
1
0
Fork 0
mirror of https://github.com/axiomatic-systems/Bento4.git synced 2026-01-12 00:18:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix dangling pointer issue for AC4.

Browse Source
This commit is contained in:
Xingzhao Yun
2024-09-13 16:44:30 +08:00
committed by yfan
parent dbb217ad13
commit 3d8c30b01b
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/C++/Codecs/Ap4Ac4Parser.cpp
View File

@@ -503,7 +503,35 @@ AP4_Ac4Parser::FindFrame(AP4_Ac4Frame& frame)
frame.m_Info.m_Ac4Dsi.d.v1.ac4_bitrate_dsi.bit_rate = 0; // unknown, fixed value now
frame.m_Info.m_Ac4Dsi.d.v1.ac4_bitrate_dsi.bit_rate_precision = 0xffffffff; // unknown, fixed value now
frame.m_Info.m_Ac4Dsi.d.v1.n_presentations = ac4_header.m_NPresentations;
frame.m_Info.m_Ac4Dsi.d.v1.presentations = ac4_header.m_PresentationV1;
if (ac4_header.m_PresentationV1) {
assert(ac4_header.m_PresentationV1 != NULL);
frame.m_Info.m_Ac4Dsi.d.v1.presentations = new AP4_Dac4Atom::Ac4Dsi::PresentationV1[ac4_header.m_NPresentations];
AP4_CopyMemory(frame.m_Info.m_Ac4Dsi.d.v1.presentations,
ac4_header.m_PresentationV1,
sizeof(AP4_Dac4Atom::Ac4Dsi::PresentationV1) * ac4_header.m_NPresentations);
for (unsigned int pres_idx = 0; pres_idx < ac4_header.m_NPresentations; pres_idx++) {
assert(ac4_header.m_PresentationV1[pres_idx].d.v1.substream_groups != NULL);
int n_substream_group = ac4_header.m_PresentationV1[pres_idx].d.v1.n_substream_groups;
frame.m_Info.m_Ac4Dsi.d.v1.presentations[pres_idx].d.v1.substream_groups = new AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1[n_substream_group];
frame.m_Info.m_Ac4Dsi.d.v1.presentations[pres_idx].d.v1.substream_group_indexs = new AP4_UI32[n_substream_group];
AP4_CopyMemory(frame.m_Info.m_Ac4Dsi.d.v1.presentations[pres_idx].d.v1.substream_group_indexs,
ac4_header.m_PresentationV1[pres_idx].d.v1.substream_group_indexs,
sizeof(AP4_UI32)*n_substream_group);
AP4_CopyMemory(frame.m_Info.m_Ac4Dsi.d.v1.presentations[pres_idx].d.v1.substream_groups,
ac4_header.m_PresentationV1[pres_idx].d.v1.substream_groups,
sizeof(AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1)*n_substream_group);
for (unsigned int sg_idx = 0; sg_idx < n_substream_group; sg_idx++) {
assert(ac4_header.m_PresentationV1[pres_idx].d.v1.substream_groups[sg_idx].d.v1.substreams != NULL);
int n_substreams = ac4_header.m_PresentationV1[pres_idx].d.v1.substream_groups[sg_idx].d.v1.n_substreams;
frame.m_Info.m_Ac4Dsi.d.v1.presentations[pres_idx].d.v1.substream_groups[sg_idx].d.v1.substreams
= new AP4_Dac4Atom::Ac4Dsi::SubStream[n_substreams];
AP4_CopyMemory(frame.m_Info.m_Ac4Dsi.d.v1.presentations[pres_idx].d.v1.substream_groups[sg_idx].d.v1.substreams,
ac4_header.m_PresentationV1[pres_idx].d.v1.substream_groups[sg_idx].d.v1.substreams,
sizeof(AP4_Dac4Atom::Ac4Dsi::SubStream) * n_substreams);
}
}
}
/* set the frame source */
frame.m_Source = &m_Bits;