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

Fix serious bug in FAT filename check, preventing most files from being created (if they contain a '.', no less). Also allow a few more chars in the long filename and make the code a bit smaller (as in FS #6358).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13776 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2007-07-03 17:03:33 +00:00
parent d4a9713d49
commit c09fcc48c6
1 changed files with 13 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

51
firmware/drivers/fat.c
View file

@ -1172,44 +1172,19 @@ static int write_long_name(struct fat_file* file,
return 0; return 0;
} }
static bool is_char_legal(char c)
{
switch(c)
{
case 0x22: /* " */
case 0x2a: /* * */
case 0x2b: /* + */
case 0x2c: /* , */
case 0x2e: /* . */
case 0x3a: /* : */
case 0x3b: /* ; */
case 0x3c: /* < */
case 0x3d: /* = */
case 0x3e: /* > */
case 0x3f: /* ? */
case 0x5b: /* [ */
case 0x5c: /* \ */
case 0x5d: /* ] */
case 0x7c: /* | */
return false;
default:
if(c < 0x20) /* Control Characters */
return false;
}
return true;
}
static int fat_checkname(const unsigned char* newname) static int fat_checkname(const unsigned char* newname)
{ {
static const char invalid_chars[] = "\"*/:<>?\\|";
int len = strlen(newname); int len = strlen(newname);
/* More sanity checks are probably needed */ /* More sanity checks are probably needed */
if (len > 255 || newname[len - 1] == '.' || if (len > 255 || newname[len - 1] == '.')
newname[0] == ' ' || newname[len - 1] == ' ' )
{ {
return -1; return -1;
} }
while (*newname) while (*newname)
{ {
if (!is_char_legal(*newname)) if (*newname < ' ' || strchr(invalid_chars, *newname) != NULL)
return -1; return -1;
newname++; newname++;
} }
@ -1380,19 +1355,19 @@ static int add_dir_entry(struct fat_dir* dir,
static unsigned char char2dos(unsigned char c, int* randomize) static unsigned char char2dos(unsigned char c, int* randomize)
{ {
if (!is_char_legal(c)) static const char invalid_chars[] = "\"*+,./:;<=>?[\\]|";
if (c <= 0x20)
c = 0; /* Illegal char, remove */
else if (strchr(invalid_chars, c) != NULL)
{ {
if(c <= 0x20) /* Illegal char, replace */
c = 0; /* Illegal char, remove */ c = '_';
else *randomize = 1; /* as per FAT spec */
{
/* Illegal char, replace */
c = '_';
*randomize = 1; /* as per FAT spec */
}
} }
else else
c = toupper(c); c = toupper(c);
return c; return c;
} }