| Message ID | 20180703210530.7493-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | bab0716c7f4793ec42e05a5aa7e80d82a0dd4e75 |
| Headers | show |
tis 2018-07-03 klockan 23:05 +0200 skrev Michael Niedermayer: > Fixes: out of array access > Fixes: mxf-crash-1c2e59bf07a34675bfb3ada5e1ec22fa9f38f923 > > > Found-by: Paul Ch <paulcher@icloud.com> > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/mxfdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > index 8c417aea26..7c6d7c07c9 100644 > --- a/libavformat/mxfdec.c > +++ b/libavformat/mxfdec.c > @@ -2146,7 +2146,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) > MXFEssenceContainerData *essence_data; > > if (!(essence_data = mxf_resolve_strong_ref(mxf, &mxf->essence_container_data_refs[k], EssenceContainerData))) { > - av_log(mxf, AV_LOG_TRACE, "could not resolve essence container data strong ref\n"); > + av_log(mxf->fc, AV_LOG_TRACE, "could not resolve essence container data strong ref\n"); Good catch /Tomas
On Tue, Jul 03, 2018 at 11:12:21PM +0200, Tomas Härdin wrote: > tis 2018-07-03 klockan 23:05 +0200 skrev Michael Niedermayer: > > Fixes: out of array access > > Fixes: mxf-crash-1c2e59bf07a34675bfb3ada5e1ec22fa9f38f923 > > > > > Found-by: Paul Ch <paulcher@icloud.com> > > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavformat/mxfdec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > > index 8c417aea26..7c6d7c07c9 100644 > > --- a/libavformat/mxfdec.c > > +++ b/libavformat/mxfdec.c > > @@ -2146,7 +2146,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) > > MXFEssenceContainerData *essence_data; > > > > if (!(essence_data = mxf_resolve_strong_ref(mxf, &mxf->essence_container_data_refs[k], EssenceContainerData))) { > > - av_log(mxf, AV_LOG_TRACE, "could not resolve essence container data strong ref\n"); > > + av_log(mxf->fc, AV_LOG_TRACE, "could not resolve essence container data strong ref\n"); > > Good catch will apply thanks [...]
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 8c417aea26..7c6d7c07c9 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2146,7 +2146,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) MXFEssenceContainerData *essence_data; if (!(essence_data = mxf_resolve_strong_ref(mxf, &mxf->essence_container_data_refs[k], EssenceContainerData))) { - av_log(mxf, AV_LOG_TRACE, "could not resolve essence container data strong ref\n"); + av_log(mxf->fc, AV_LOG_TRACE, "could not resolve essence container data strong ref\n"); continue; } if (!memcmp(component->source_package_ul, essence_data->package_ul, sizeof(UID)) && !memcmp(component->source_package_uid, essence_data->package_uid, sizeof(UID))) {
Fixes: out of array access Fixes: mxf-crash-1c2e59bf07a34675bfb3ada5e1ec22fa9f38f923 Found-by: Paul Ch <paulcher@icloud.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)