diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 12:58:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 13:01:40 +0100 |
| commit | eb215be9ce74f90d5aff304ad593f17a313f71fd (patch) | |
| tree | 82004ac1a2c3ab93d6ce57f640611b0bc26cc130 | |
| parent | 24c76bae5f47c14ed70e4857eaa3138df566b4cc (diff) | |
| parent | 54bc15d5ebfd07fd468743ba29f709ea19e840b9 (diff) | |
| download | ffmpeg-eb215be9ce74f90d5aff304ad593f17a313f71fd.tar.gz | |
Merge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9'
* commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9':
id3v2: fix reading v2.2 attached pictures
Conflicts:
libavformat/id3v2.c
See: 05c3c568dccd6c42fdf6eea891d08c71fe2ee772
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/id3v2.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 708a1ae665..2c7b6a59b8 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -404,7 +404,8 @@ error: * Parse GEOB tag into a ID3v2ExtraMetaGEOB struct. */ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, - const char *tag, ID3v2ExtraMeta **extra_meta, int isv34) + const char *tag, ID3v2ExtraMeta **extra_meta, + int isv34) { ID3v2ExtraMetaGEOB *geob_data = NULL; ID3v2ExtraMeta *new_extra = NULL; @@ -536,7 +537,8 @@ static void free_apic(void *obj) } static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, - const char *tag, ID3v2ExtraMeta **extra_meta, int isv34) + const char *tag, ID3v2ExtraMeta **extra_meta, + int isv34) { int enc, pic_type; char mimetype[64]; @@ -546,7 +548,7 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, ID3v2ExtraMeta *new_extra = NULL; int64_t end = avio_tell(pb) + taglen; - if (taglen <= 4) + if (taglen <= 4 || (!isv34 && taglen <= 6)) goto fail; new_extra = av_mallocz(sizeof(*new_extra)); @@ -559,11 +561,13 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, /* mimetype */ if (isv34) { - taglen -= avio_get_str(pb, taglen, mimetype, sizeof(mimetype)); + taglen -= avio_get_str(pb, taglen, mimetype, sizeof(mimetype)); } else { avio_read(pb, mimetype, 3); mimetype[3] = 0; + taglen -= 3; } + while (mime->id != AV_CODEC_ID_NONE) { if (!av_strncasecmp(mime->str, mimetype, sizeof(mimetype))) { id = mime->id; @@ -718,7 +722,8 @@ typedef struct ID3v2EMFunc { const char *tag3; const char *tag4; void (*read)(AVFormatContext *s, AVIOContext *pb, int taglen, - const char *tag, ID3v2ExtraMeta **extra_meta, int isv34); + const char *tag, ID3v2ExtraMeta **extra_meta, + int isv34); void (*free)(void *obj); } ID3v2EMFunc; |