github-repos/rinetd
1
0
Fork 0
mirror of https://github.com/samhocevar/rinetd.git synced 2025-03-22 15:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Properly release the lexer context after reading the configuration.

Browse Source
This commit is contained in:
Sam Hocevar 2021-02-14 11:20:37 +01:00
parent 5a70f2bf4e
commit f9f5aeda80
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/parse.c
View File

@ -355,7 +355,7 @@ YY_ACTION(void) yy_1_sol(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_sol\n")); yyprintf((stderr, "do yy_1_sol\n"));
{ {
#line 159 #line 161
++yy->currentLine; ; ++yy->currentLine; ;
} }
#undef yythunkpos #undef yythunkpos
@ -369,7 +369,7 @@ YY_ACTION(void) yy_1_invalid_syntax(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_invalid_syntax\n")); yyprintf((stderr, "do yy_1_invalid_syntax\n"));
{ {
#line 137 #line 139
fprintf(stderr, "rinetd: invalid syntax at line %d: %s\n", fprintf(stderr, "rinetd: invalid syntax at line %d: %s\n",
yy->currentLine, yytext); yy->currentLine, yytext);
@ -387,7 +387,7 @@ YY_ACTION(void) yy_1_logcommon(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_logcommon\n")); yyprintf((stderr, "do yy_1_logcommon\n"));
{ {
#line 132 #line 134
logFormatCommon = 1; logFormatCommon = 1;
; ;
@ -403,7 +403,7 @@ YY_ACTION(void) yy_1_pidlogfile(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_pidlogfile\n")); yyprintf((stderr, "do yy_1_pidlogfile\n"));
{ {
#line 124 #line 126
pidLogFileName = strdup(yytext); pidLogFileName = strdup(yytext);
if (!pidLogFileName) { if (!pidLogFileName) {
@ -422,7 +422,7 @@ YY_ACTION(void) yy_1_logfile(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_logfile\n")); yyprintf((stderr, "do yy_1_logfile\n"));
{ {
#line 116 #line 118
logFileName = strdup(yytext); logFileName = strdup(yytext);
if (!logFileName) { if (!logFileName) {
@ -441,7 +441,7 @@ YY_ACTION(void) yy_1_auth_key(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_auth_key\n")); yyprintf((stderr, "do yy_1_auth_key\n"));
{ {
#line 113 #line 115
yy->isAuthAllow = (yytext[0] == 'a'); ; yy->isAuthAllow = (yytext[0] == 'a'); ;
} }
#undef yythunkpos #undef yythunkpos
@ -455,7 +455,7 @@ YY_ACTION(void) yy_1_auth_rule(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_auth_rule\n")); yyprintf((stderr, "do yy_1_auth_rule\n"));
{ {
#line 91 #line 93
allRules = (Rule *) allRules = (Rule *)
realloc(allRules, sizeof(Rule) * (allRulesCount + 1)); realloc(allRules, sizeof(Rule) * (allRulesCount + 1));
@ -489,7 +489,7 @@ YY_ACTION(void) yy_3_proto(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_3_proto\n")); yyprintf((stderr, "do yy_3_proto\n"));
{ {
#line 88 #line 90
yy->tmpProto = protoTcp; ; yy->tmpProto = protoTcp; ;
} }
#undef yythunkpos #undef yythunkpos
@ -503,7 +503,7 @@ YY_ACTION(void) yy_2_proto(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_2_proto\n")); yyprintf((stderr, "do yy_2_proto\n"));
{ {
#line 87 #line 89
yy->tmpProto = protoUdp; ; yy->tmpProto = protoUdp; ;
} }
#undef yythunkpos #undef yythunkpos
@ -517,7 +517,7 @@ YY_ACTION(void) yy_1_proto(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_proto\n")); yyprintf((stderr, "do yy_1_proto\n"));
{ {
#line 86 #line 88
yy->tmpProto = protoTcp; ; yy->tmpProto = protoTcp; ;
} }
#undef yythunkpos #undef yythunkpos
@ -531,8 +531,9 @@ YY_ACTION(void) yy_1_port(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_port\n")); yyprintf((stderr, "do yy_1_port\n"));
{ {
#line 85 #line 86
yy->tmpPort = strdup(yytext); ; free(yy->tmpPort);
yy->tmpPort = strdup(yytext); ;
} }
#undef yythunkpos #undef yythunkpos
#undef yypos #undef yypos
@ -545,7 +546,7 @@ YY_ACTION(void) yy_1_full_port(yycontext *yy, char *yytext, int yyleng)
#define yythunkpos yy->__thunkpos #define yythunkpos yy->__thunkpos
yyprintf((stderr, "do yy_1_full_port\n")); yyprintf((stderr, "do yy_1_full_port\n"));
{ {
#line 74 #line 75
char const *proto = yy->tmpProto == protoTcp ? "tcp" : "udp"; char const *proto = yy->tmpProto == protoTcp ? "tcp" : "udp";
struct servent *service = getservbyname(yy->tmpPort, proto); struct servent *service = getservbyname(yy->tmpPort, proto);
@ -569,7 +570,8 @@ YY_ACTION(void) yy_1_option_source(yycontext *yy, char *yytext, int yyleng)
yyprintf((stderr, "do yy_1_option_source\n")); yyprintf((stderr, "do yy_1_option_source\n"));
{ {
#line 71 #line 71
yy->sourceAddress = strdup(yytext); ; free(yy->sourceAddress);
yy->sourceAddress = strdup(yytext); ;
} }
#undef yythunkpos #undef yythunkpos
#undef yypos #undef yypos
@ -1354,7 +1356,7 @@ YY_PARSE(yycontext *) YYRELEASE(yycontext *yyctx)
} }
#endif #endif
#line 163 "parse.peg" #line 165 "parse.peg"
void parseConfiguration(char const *file) void parseConfiguration(char const *file)
@ -1372,6 +1374,9 @@ void parseConfiguration(char const *file)
"on file %s, line %d.\n", file, -1); "on file %s, line %d.\n", file, -1);
exit(1); exit(1);
} }
free(ctx.sourceAddress);
free(ctx.tmpPort);
yyrelease(&ctx);
fclose(in); fclose(in);

9
src/parse.peg
View File

@ -68,7 +68,8 @@ server-options = "[" -? option-list -? "]"
option-list = option (-? ',' -? option-list)? option-list = option (-? ',' -? option-list)?
option = (option-timeout | option-source) option = (option-timeout | option-source)
option-timeout = "timeout" -? "=" -? < number > { yy->serverTimeout = atoi(yytext); } option-timeout = "timeout" -? "=" -? < number > { yy->serverTimeout = atoi(yytext); }
option-source = "src" -? "=" -? < address > { yy->sourceAddress = strdup(yytext); } option-source = "src" -? "=" -? < address > { free(yy->sourceAddress);
yy->sourceAddress = strdup(yytext); }
full-port = port proto full-port = port proto
{ {
@ -82,7 +83,8 @@ full-port = port proto
yy->tmpPortNum = (uint16_t)port; yy->tmpPortNum = (uint16_t)port;
} }
port = < (number | service) > { yy->tmpPort = strdup(yytext); } port = < (number | service) > { free(yy->tmpPort);
yy->tmpPort = strdup(yytext); }
proto = '/tcp' { yy->tmpProto = protoTcp; } proto = '/tcp' { yy->tmpProto = protoTcp; }
| '/udp' { yy->tmpProto = protoUdp; } | '/udp' { yy->tmpProto = protoUdp; }
| '' { yy->tmpProto = protoTcp; } | '' { yy->tmpProto = protoTcp; }
@ -177,6 +179,9 @@ void parseConfiguration(char const *file)
"on file %s, line %d.\n", file, -1); "on file %s, line %d.\n", file, -1);
exit(1); exit(1);
} }
free(ctx.sourceAddress);
free(ctx.tmpPort);
yyrelease(&ctx);
fclose(in); fclose(in);