virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Fixed NULL pointer dereference in id3v2 parser.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Laurent Aimar 2011-09-25 00:38:23 +02:00 committed by Michael Niedermayer
parent 02aabd820f
commit f57b00e897
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/id3v2.c
View File

@ -348,7 +348,7 @@ static const ID3v2EMFunc *get_extra_meta_func(const char *tag, int isv34)
return &ff_id3v2_extra_meta_funcs[i]; return &ff_id3v2_extra_meta_funcs[i];
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) 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[] = { const ID3v2EMFunc ff_id3v2_extra_meta_funcs[] = {
{ "GEO", "GEOB", read_geobtag, free_geobtag }, { "GEO", "GEOB", read_geobtag, free_geobtag },
{ NULL } { NULL, NULL, NULL, NULL }
}; };
const AVMetadataConv ff_id3v2_34_metadata_conv[] = { const AVMetadataConv ff_id3v2_34_metadata_conv[] = {