generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/id3v1: strip trailing whitespace

Browse Source 
ID3v1 fields have a fixed size, and they are padded either with zeros,
or with spaces. Handle the latter case, instead of putting strings with
trailing spaces into the AVDictionary.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
wm4 2015-01-05 18:56:19 +01:00 committed by Michael Niedermayer
parent 08810a8895
commit bd78010407
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/id3v1.c
View File

@ -179,7 +179,7 @@ static void get_string(AVFormatContext *s, const char *key,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
int i, c; int i, c;
char *q, str[512]; char *q, str[512], *first_free_space = NULL;
q = str; q = str;
for(i = 0; i < buf_size; i++) { for(i = 0; i < buf_size; i++) {
@ -188,10 +188,19 @@ static void get_string(AVFormatContext *s, const char *key,
break; break;
if ((q - str) >= sizeof(str) - 1) if ((q - str) >= sizeof(str) - 1)
break; break;
if (c == ' ') {
if (!first_free_space)
first_free_space = q;
} else {
first_free_space = NULL;
}
*q++ = c; *q++ = c;
} }
*q = '\0'; *q = '\0';
if (first_free_space)
*first_free_space = '\0';
if (*str) if (*str)
av_dict_set(&s->metadata, key, str, 0); av_dict_set(&s->metadata, key, str, 0);
} }