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

ircd_lexer: fix another crash with the same cause

Browse source
This commit is contained in:
Aaron Jones 2016-05-15 00:57:16 +00:00
parent 401cb2bb17
commit 72640a9ddf
No known key found for this signature in database
GPG key ID: 6E854C0FAAD4CEA4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ircd/ircd_lexer.l
View file

@ -94,7 +94,7 @@ include \.include{ws}(\<.*\>|\".*\")
} }
else else
{ {
strcpy(yylval.string, yytext + 1); rb_strlcpy(yylval.string, yytext + 1, 1024);
if(yylval.string[yyleng-2] != '"') if(yylval.string[yyleng-2] != '"')
ilog(L_MAIN, "Unterminated character string"); ilog(L_MAIN, "Unterminated character string");
else else
@ -134,7 +134,7 @@ include \.include{ws}(\<.*\>|\".*\")
loadmodule { return LOADMODULE; } loadmodule { return LOADMODULE; }
{string} { {string} {
strcpy(yylval.string, yytext); rb_strlcpy(yylval.string, yytext, 1024);
yylval.string[yyleng] = '\0'; yylval.string[yyleng] = '\0';
return STRING; return STRING;
} }

2
ircd/ircd_parser.y
View file

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