9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure the parser/lexer don't use IRCD_BUFSIZE.

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-23 09:25:56 -05:00
parent 82236a2a65
commit 7ac3261f97
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ircd/ircd_lexer.l
View file

@ -53,8 +53,8 @@ void cinclude(void);
void hashcomment(void); void hashcomment(void);
int ieof(void); int ieof(void);
int lineno_stack[MAX_INCLUDE_DEPTH]; int lineno_stack[MAX_INCLUDE_DEPTH];
char conffile_stack[MAX_INCLUDE_DEPTH][IRCD_BUFSIZE]; char conffile_stack[MAX_INCLUDE_DEPTH][BUFSIZE];
char conffilebuf[IRCD_BUFSIZE+1]; char conffilebuf[BUFSIZE+1];
char *current_file = conffilebuf; char *current_file = conffilebuf;
FILE *inc_fbfile_in[MAX_INCLUDE_DEPTH]; FILE *inc_fbfile_in[MAX_INCLUDE_DEPTH];
@ -195,7 +195,7 @@ void cinclude(void)
if (tmp_fbfile_in == NULL) if (tmp_fbfile_in == NULL)
{ {
/* if its not found in PREFIX, look in ETCPATH */ /* if its not found in PREFIX, look in ETCPATH */
char fnamebuf[IRCD_BUFSIZE]; char fnamebuf[BUFSIZE];
snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ETCPATH, c); snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ETCPATH, c);
tmp_fbfile_in = fopen(fnamebuf, "r"); tmp_fbfile_in = fopen(fnamebuf, "r");

2
ircd/ircd_parser.y
View file

@ -161,7 +161,7 @@ static void add_cur_list(int type, char *str, int number)
%union { %union {
int number; int number;
char string[IRCD_BUFSIZE + 1]; char string[BUFSIZE + 1];
conf_parm_t * conf_parm; conf_parm_t * conf_parm;
} }