diff mbox

[FFmpeg-devel] mxfdec: fix NULL pointer dereference

Message ID 3ceeccd6-d64b-4426-d8ea-2ccf3b4b3211@googlemail.com
State Accepted
Commit 0efb6106118c17308b3fdc3190f5e5bf84b01d5c
Headers show

Commit Message

Andreas Cadhalpun Nov. 4, 2016, 11:20 p.m. UTC 
Metadata streams have priv_data set to NULL.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
---
 libavformat/mxfdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Nov. 5, 2016, 1:09 a.m. UTC | #1 
On Sat, Nov 05, 2016 at 12:20:21AM +0100, Andreas Cadhalpun wrote:
> Metadata streams have priv_data set to NULL.
> 
> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
> ---
>  libavformat/mxfdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

probably ok, iam not a mxf expert though

thx

[...]
Andreas Cadhalpun Nov. 5, 2016, 6:03 p.m. UTC | #2 
On 05.11.2016 02:09, Michael Niedermayer wrote:
> On Sat, Nov 05, 2016 at 12:20:21AM +0100, Andreas Cadhalpun wrote:
>> Metadata streams have priv_data set to NULL.
>>
>> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
>> ---
>>  libavformat/mxfdec.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> probably ok, iam not a mxf expert though

Pushed.

Best regards,
Andreas
diff mbox

Patch

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index d2166ee..a1a79ce 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -391,7 +391,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 */