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

Adds a filename sanity check to add_dir_entry that at the moment only checks for names ending in a period, but can easily be extended. Changes the error codes for add_dir_entry. Fixes bug #782248.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7487 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonas Häggqvist 2005-09-07 01:35:15 +00:00
parent 0dea3efd2f
commit 98143f5291
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
firmware/drivers/fat.c
View file

@ -1234,6 +1234,15 @@ static int write_long_name(struct fat_file* file,
return 0;
}
static int fat_checkname(const unsigned char* newname)
{
/* More sanity checks are probably needed */
if ( newname[strlen(newname) - 1] == '.' ) {
return -1;
}
return 0;
}
static int add_dir_entry(struct fat_dir* dir,
struct fat_file* file,
const char* name,
@ -1256,6 +1265,15 @@ static int add_dir_entry(struct fat_dir* dir,
LDEBUGF( "add_dir_entry(%s,%lx)\n",
name, file->firstcluster);
/* Don't check dotdirs name for validity */
if (dotdir == false) {
rc = fat_checkname(name);
if (rc < 0) {
/* filename is invalid */
return rc * 10 - 1;
}
}
#ifdef HAVE_MULTIVOLUME
file->volume = dir->file.volume; /* inherit the volume, to make sure */
#endif
@ -1282,7 +1300,7 @@ static int add_dir_entry(struct fat_dir* dir,
rc = fat_seek(&dir->file, 0);
if (rc < 0)
return rc * 10 - 1;
return rc * 10 - 2;
/* step 1: search for free entries and check for duplicate shortname */
for (sector = 0; !done; sector++)
@ -1293,7 +1311,7 @@ static int add_dir_entry(struct fat_dir* dir,
if (rc < 0) {
DEBUGF( "add_dir_entry() - Couldn't read dir"
" (error code %d)\n", rc);
return rc * 10 - 2;
return rc * 10 - 3;
}
if (rc == 0) { /* current end of dir reached */