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

open_plugin.c (CORE) File input Bugfixes

Browse source 
Explicitly Null terminate char fields
0 is a valid file descriptor

Change-Id: I0faa9f5ec919ca913bceabf919fbaefcb38c39b9
This commit is contained in:
William Wilgus 2021-07-29 23:13:20 -04:00
parent ea438ee132
commit f9c5d1fccf
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/open_plugin.c
View file

@ -60,12 +60,12 @@ static int op_update_dat(struct open_plugin_entry_t *entry)
hash = entry->hash;
fd = open(OPEN_PLUGIN_DAT ".tmp", O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (!fd)
if (fd < 0)
return -1;
write(fd, entry, op_entry_sz);
fd1 = open(OPEN_PLUGIN_DAT, O_RDONLY);
if (fd1)
if (fd1 >= 0)
{
while (read(fd1, &open_plugin_entry, op_entry_sz) == op_entry_sz)
{
@ -189,13 +189,18 @@ static int open_plugin_hash_get_entry(uint32_t hash,
int fd = open(dat_file, O_RDONLY);
if (fd)
if (fd >= 0)
{
while (read(fd, entry, op_entry_sz) == op_entry_sz)
{
record++;
if (hash == 0 || entry->hash == hash)
{
/* NULL terminate fields NOTE -- all are actually +1 larger */
entry->name[OPEN_PLUGIN_NAMESZ] = '\0';
/*entry->key[OPEN_PLUGIN_BUFSZ] = '\0';*/
entry->path[OPEN_PLUGIN_BUFSZ] = '\0';
entry->param[OPEN_PLUGIN_BUFSZ] = '\0';
ret = record;
break;
}