Compare commits

...

2 commits

Author SHA1 Message Date
Solomon Peachy
b9ca4ba456 metadata: MPEG4 'trkn' field is actually numeric
So accept whatever value is supplied as correct.

Change-Id: Ic5ba6909f036957bceeaf7e79ad24273dac2e677
2025-12-13 19:19:52 -05:00
Solomon Peachy
bc627659ec FS13713: Fix null ponter deref with mp4 files with a tracknum of 0
mp4 metadata doesn't use strtol, so needs to handle things differently.

Change-Id: Idb54fae845b08222ea6b79870f6b99390af9c684
2025-12-13 17:54:29 -05:00

View file

@ -482,11 +482,7 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
break; break;
case MP4_trkn: { case MP4_trkn: {
char *p = NULL; read_mp4_tag_i_from_n(fd, &id3->tracknum, &id3->track_string, size, &buffer_left, &buffer);
int tracknum = 0;
read_mp4_tag_i_from_n(fd, &tracknum, &id3->track_string, size, &buffer_left, &buffer);
if (!(tracknum == 0 && (errno || *p)))
id3->tracknum = tracknum;
break; break;
} }
#ifdef HAVE_ALBUMART #ifdef HAVE_ALBUMART