From f57b00e89749b559da7cd99a4b630c90617e17d4 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 25 Sep 2011 00:38:23 +0200 Subject: [PATCH] Fixed NULL pointer dereference in id3v2 parser. Signed-off-by: Michael Niedermayer --- libavformat/id3v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 29ba1abc5e..dfa9a71443 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -348,7 +348,7 @@ static const ID3v2EMFunc *get_extra_meta_func(const char *tag, int isv34) return &ff_id3v2_extra_meta_funcs[i]; i++; } - return NULL; + return &ff_id3v2_extra_meta_funcs[i]; } static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags, ID3v2ExtraMeta **extra_meta) @@ -531,7 +531,7 @@ void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta) const ID3v2EMFunc ff_id3v2_extra_meta_funcs[] = { { "GEO", "GEOB", read_geobtag, free_geobtag }, - { NULL } + { NULL, NULL, NULL, NULL } }; const AVMetadataConv ff_id3v2_34_metadata_conv[] = {