Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lastfm_scrobbler check pointers for validity

Browse source 
we need to make sure we don't deref NULL pointers

Change-Id: I9c564b681cd20222c3a134680e60a310b2eb846c
This commit is contained in:
William Wilgus 2022-04-02 07:42:06 -04:00
parent 98f762316f
commit 43abe2d820
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/plugins/lastfm_scrobbler.c
View file

@ -317,6 +317,11 @@ static void scrobbler_flush_callback(void)
} }
#endif #endif
static inline char* str_chk_valid(char *s, char *alt)
{
return (s != NULL ? s : alt);
}
static void scrobbler_add_to_cache(const struct mp3entry *id) static void scrobbler_add_to_cache(const struct mp3entry *id)
{ {
if ( gCache.pos >= SCROBBLER_MAX_CACHE ) if ( gCache.pos >= SCROBBLER_MAX_CACHE )
@ -335,17 +340,19 @@ static void scrobbler_add_to_cache(const struct mp3entry *id)
if (id->tracknum > 0) if (id->tracknum > 0)
rb->snprintf(tracknum, sizeof (tracknum), "%d", id->tracknum); rb->snprintf(tracknum, sizeof (tracknum), "%d", id->tracknum);
char* artist = id->artist ? id->artist : id->albumartist;
int ret = rb->snprintf(&scrobbler_buf[(SCROBBLER_CACHE_LEN*gCache.pos)], int ret = rb->snprintf(&scrobbler_buf[(SCROBBLER_CACHE_LEN*gCache.pos)],
SCROBBLER_CACHE_LEN, SCROBBLER_CACHE_LEN,
"%s\t%s\t%s\t%s\t%d\t%c\t%ld\t%s\n", "%s\t%s\t%s\t%s\t%d\t%c\t%ld\t%s\n",
id->artist ? id->artist : id->albumartist, str_chk_valid(artist, UNTAGGED),
id->album, str_chk_valid(id->album, ""),
id->title, str_chk_valid(id->title, ""),
tracknum, tracknum,
(int)(id->length / 1000), (int)(id->length / 1000),
rating, rating,
get_timestamp(), get_timestamp(),
id->mb_track_id); str_chk_valid(id->mb_track_id, ""));
if ( ret >= SCROBBLER_CACHE_LEN ) if ( ret >= SCROBBLER_CACHE_LEN )
{ {