diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-25 00:38:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-25 23:01:43 +0200 |
| commit | f57b00e89749b559da7cd99a4b630c90617e17d4 (patch) | |
| tree | cd520324148a511edc2321b848dfa30d71d4a853 /libavformat | |
| parent | 02aabd820fab23bc560c81578a58419c0f912c66 (diff) | |
| download | ffmpeg-f57b00e89749b559da7cd99a4b630c90617e17d4.tar.gz | |
Fixed NULL pointer dereference in id3v2 parser.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/id3v2.c | 4 |
1 files 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[] = { |