devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

playlist_catalog fix strcpy overlap, potential buffer overrun

Browse source 
Change-Id: I7cd1302d2c905992078351a531a5d67fdb465809
This commit is contained in:
William Wilgus 2021-08-01 21:31:10 -04:00 • committed by William Wilgus
parent 83653023d4
commit 2346a7aa6d
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/playlist_catalog.c
View file

@ -87,11 +87,14 @@ static int initialize_catalog(void)
mkdir(playlist_dir); mkdir(playlist_dir);
} }
playlist_dir_length = strlen(playlist_dir);
/* remove duplicate leading '/' */ /* remove duplicate leading '/' */
if (playlist_dir[0] == '/' && playlist_dir[1] == '/') if (playlist_dir[0] == '/' && playlist_dir[1] == '/')
strcpy(playlist_dir, &playlist_dir[1]); {
memmove(&playlist_dir[0], &playlist_dir[1], playlist_dir_length); /* gets the \0 too */
playlist_dir_length = strlen(playlist_dir); playlist_dir_length--;
}
if (dir_exists(playlist_dir)) if (dir_exists(playlist_dir))
{ {
@ -125,7 +128,8 @@ void catalog_set_directory(const char* directory)
} }
else else
{ {
strcpy(global_settings.playlist_catalog_dir, directory); strlcpy(global_settings.playlist_catalog_dir,
directory, sizeof(global_settings.playlist_catalog_dir));
} }
initialized = false; initialized = false;
initialize_catalog(); initialize_catalog();