Commit bd780104 authored by wm4's avatar wm4 Committed by Michael Niedermayer

avformat/id3v1: strip trailing whitespace

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 08810a88
......@@ -179,7 +179,7 @@ static void get_string(AVFormatContext *s, const char *key,
const uint8_t *buf, int buf_size)
{
int i, c;
char *q, str[512];
char *q, str[512], *first_free_space = NULL;
q = str;
for(i = 0; i < buf_size; i++) {
......@@ -188,10 +188,19 @@ static void get_string(AVFormatContext *s, const char *key,
break;
if ((q - str) >= sizeof(str) - 1)
break;
if (c == ' ') {
if (!first_free_space)
first_free_space = q;
} else {
first_free_space = NULL;
}
*q++ = c;
}
*q = '\0';
if (first_free_space)
*first_free_space = '\0';
if (*str)
av_dict_set(&s->metadata, key, str, 0);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment