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

ircd_lexer: fix crash with very large config option strings

Browse source
This commit is contained in:
Aaron Jones 2016-05-14 23:58:07 +00:00
parent 96129f7d4d
commit f55078bdc7
No known key found for this signature in database
GPG key ID: 6E854C0FAAD4CEA4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ircd_lexer.l
View file

@ -62,7 +62,7 @@ char *current_file = conffilebuf;
FILE *inc_fbfile_in[MAX_INCLUDE_DEPTH]; FILE *inc_fbfile_in[MAX_INCLUDE_DEPTH];
char linebuf[512]; char yy_linebuf[16384];
#undef YY_INPUT #undef YY_INPUT
@ -83,7 +83,7 @@ include \.include{ws}(\<.*\>|\".*\")
%% %%
{include} { cinclude(); } {include} { cinclude(); }
"/*" { ccomment(); } "/*" { ccomment(); }
\n.* { strcpy(linebuf, yytext+1); lineno++; yyless(1); } \n.* { rb_strlcpy(yy_linebuf, yytext+1, sizeof(yy_linebuf)); lineno++; yyless(1); }
{ws} ; {ws} ;
{comment} { hashcomment(); } {comment} { hashcomment(); }

4
src/s_conf.c
View file

@ -58,7 +58,7 @@
struct config_server_hide ConfigServerHide; struct config_server_hide ConfigServerHide;
extern int yyparse(void); /* defined in y.tab.c */ extern int yyparse(void); /* defined in y.tab.c */
extern char linebuf[]; extern char yy_linebuf[16384]; /* defined in ircd_lexer.l */
#ifndef INADDR_NONE #ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff) #define INADDR_NONE ((unsigned int) 0xffffffff)
@ -1647,7 +1647,7 @@ yyerror(const char *msg)
{ {
char newlinebuf[BUFSIZE]; char newlinebuf[BUFSIZE];
strip_tabs(newlinebuf, linebuf, strlen(linebuf)); strip_tabs(newlinebuf, yy_linebuf, strlen(yy_linebuf));
ierror("\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf); ierror("\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf);
sendto_realops_snomask(SNO_GENERAL, L_ALL, "\"%s\", line %d: %s at '%s'", sendto_realops_snomask(SNO_GENERAL, L_ALL, "\"%s\", line %d: %s at '%s'",