DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Added code to zero out rcfile path before setting it. Also added a bounds check to that as well.

Browse Source 
git-svn-id: file:///home/mbr/svn/fwknop/trunk@301 510a4753-2344-4c79-9c09-4d669213fbeb
This commit is contained in:
Damien Stuart 2010-11-14 00:16:32 +00:00
parent 0f6ca00ac4
commit 04ebf6c2ad
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/config_init.c
View File

@ -382,8 +382,9 @@ process_rc(fko_cli_options_t *options)
{ {
FILE *rc; FILE *rc;
int line_num = 0; int line_num = 0;
char rcfile[MAX_PATH_LEN]; int rcf_offset;
char line[MAX_LINE_LEN]; char line[MAX_LINE_LEN];
char rcfile[MAX_PATH_LEN];
char curr_stanza[MAX_LINE_LEN] = {0}; char curr_stanza[MAX_LINE_LEN] = {0};
char var[MAX_LINE_LEN] = {0}; char var[MAX_LINE_LEN] = {0};
char val[MAX_LINE_LEN] = {0}; char val[MAX_LINE_LEN] = {0};
@ -403,8 +404,24 @@ process_rc(fko_cli_options_t *options)
return; return;
} }
memset(rcfile, 0x0, MAX_PATH_LEN);
strlcpy(rcfile, homedir, MAX_PATH_LEN); strlcpy(rcfile, homedir, MAX_PATH_LEN);
rcfile[strlen(rcfile)] = PATH_SEP;
rcf_offset = strlen(rcfile);
/* Sanity check the path to .fwknoprc.
* The preceeding path plus the path separator and '.fwknoprc' = 11
* cannot exceed MAX_PATH_LEN.
*/
if(rcf_offset > (MAX_PATH_LEN - 11))
{
fprintf(stderr, "Warning: Path to .fwknoprc file is too long.\n"
" No .fwknoprc file processed.\n");
return;
}
rcfile[rcf_offset] = PATH_SEP;
strlcat(rcfile, ".fwknoprc", MAX_PATH_LEN); strlcat(rcfile, ".fwknoprc", MAX_PATH_LEN);
/* Open the rc file for reading, if it does not exist, then create /* Open the rc file for reading, if it does not exist, then create