mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/id3demux/id3v2frames.c: Don't output any tag when we encounter a negative track number - the tag type is uint, so...

Browse source 
Original commit message from CVS:
* gst/id3demux/id3v2frames.c: (id3v2_tag_to_taglist):
Don't output any tag when we encounter a negative track number - the
tag type is uint, so we end up outputting huge positive numbers
instead. (Fixes: #342029)
This commit is contained in:
Jan Schmidt 2006-05-19 14:05:53 +00:00
parent 46e6f57714
commit a4dbbd5d2a
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-05-19 Jan Schmidt <thaytan@mad.scientist.com>
* gst/id3demux/id3v2frames.c: (id3v2_tag_to_taglist):
Don't output any tag when we encounter a negative track number - the
tag type is uint, so we end up outputting huge positive numbers
instead. (Fixes: #342029)
2006-05-19 Thomas Vander Stichele <thomas at apestaart dot org> 2006-05-19 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: * configure.ac:

55
gst/id3demux/id3v2frames.c
View file

@ -450,41 +450,34 @@ id3v2_tag_to_taglist (ID3TagsWorking * work, const gchar * tag_name,
switch (tag_type) { switch (tag_type) {
case G_TYPE_UINT: case G_TYPE_UINT:
{ {
guint tmp; gint current, total;
gchar *check;
tmp = strtoul ((char *) tag_str, &check, 10); if (sscanf (tag_str, "%d/%d", &current, &total) == 2) {
if (total < 0) {
if (strcmp (tag_name, GST_TAG_TRACK_NUMBER) == 0) { GST_WARNING ("Ignoring negative value for total %d in tag %s",
if (*check == '/') { total, tag_name);
guint total; } else {
if (strcmp (tag_name, GST_TAG_TRACK_NUMBER) == 0) {
check++; gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND,
total = strtoul (check, &check, 10); GST_TAG_TRACK_COUNT, total, NULL);
if (*check != '\0') } else if (strcmp (tag_name, GST_TAG_ALBUM_VOLUME_NUMBER) == 0) {
break; gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND,
GST_TAG_ALBUM_VOLUME_COUNT, total, NULL);
gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND, }
GST_TAG_TRACK_COUNT, total, NULL);
}
} else if (strcmp (tag_name, GST_TAG_ALBUM_VOLUME_NUMBER) == 0) {
if (*check == '/') {
guint total;
check++;
total = strtoul (check, &check, 10);
if (*check != '\0')
break;
gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND,
GST_TAG_ALBUM_VOLUME_COUNT, total, NULL);
} }
} else if (sscanf (tag_str, "%d", &current) != 1) {
/* Not an integer in the string */
GST_WARNING ("Tag string for tag %s does not contain an integer - "
"ignoring", tag_name);
break;
} }
if (*check != '\0') if (current < 0)
break; GST_WARNING ("Ignoring negative value %d in tag %s", current, tag_name);
else {
gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND, tag_name, tmp, NULL); gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND, tag_name, current,
NULL);
}
break; break;
} }
case G_TYPE_UINT64: case G_TYPE_UINT64: