[FFmpeg-cvslog] mxfdec: fix NULL pointer dereference
Andreas Cadhalpun
git at videolan.org
Sun Nov 27 01:41:09 EET 2016
ffmpeg | branch: release/3.0 | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Sat Nov 5 00:17:53 2016 +0100| [e78d9f3f35e379ab7da729360e3eb5ad39c150fa] | committer: Andreas Cadhalpun
mxfdec: fix NULL pointer dereference
Metadata streams have priv_data set to NULL.
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
(cherry picked from commit 0efb6106118c17308b3fdc3190f5e5bf84b01d5c)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e78d9f3f35e379ab7da729360e3eb5ad39c150fa
---
libavformat/mxfdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index f4222fc..9e505da 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -382,7 +382,7 @@ static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv)
for (i = 0; i < s->nb_streams; i++) {
MXFTrack *track = s->streams[i]->priv_data;
/* SMPTE 379M 7.3 */
- if (!memcmp(klv->key + sizeof(mxf_essence_element_key), track->track_number, sizeof(track->track_number)))
+ if (track && !memcmp(klv->key + sizeof(mxf_essence_element_key), track->track_number, sizeof(track->track_number)))
return i;
}
/* return 0 if only one stream, for OP Atom files with 0 as track number */
More information about the ffmpeg-cvslog
mailing list