hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing check for fopen return value

Browse Source 
This would have led to a crash when a NULL pointer would have been used as
a valid FILE handle.
This commit is contained in:
Markus Makela
2016-02-25 20:10:37 +02:00
parent 2c28d8c5de
commit 784166ad0b
1 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -1286,41 +1286,53 @@ static bool process_user_templates(FW_INSTANCE *instance, user_template_t *templ
*/ */
static bool process_rule_file(const char* filename, FW_INSTANCE* instance) static bool process_rule_file(const char* filename, FW_INSTANCE* instance)
{ {
int rc = 1;
FILE *file = fopen(filename, "r"); FILE *file = fopen(filename, "r");
yyscan_t scanner;
struct parser_stack pstack;
pstack.rule = NULL; if (file)
pstack.user = NULL;
pstack.active_rules = NULL;
pstack.templates = NULL;
dbfw_yylex_init(&scanner);
YY_BUFFER_STATE buf = dbfw_yy_create_buffer(file, YY_BUF_SIZE, scanner);
dbfw_yyset_extra(&pstack, scanner);
dbfw_yy_switch_to_buffer(buf, scanner);
/** Parse the rule file */
int rc = dbfw_yyparse(scanner);
dbfw_yy_delete_buffer(buf, scanner);
dbfw_yylex_destroy(scanner);
fclose(file);
if (rc == 0 && process_user_templates(instance, pstack.templates, pstack.rule))
{ {
instance->rules = pstack.rule; yyscan_t scanner;
struct parser_stack pstack;
pstack.rule = NULL;
pstack.user = NULL;
pstack.active_rules = NULL;
pstack.templates = NULL;
dbfw_yylex_init(&scanner);
YY_BUFFER_STATE buf = dbfw_yy_create_buffer(file, YY_BUF_SIZE, scanner);
dbfw_yyset_extra(&pstack, scanner);
dbfw_yy_switch_to_buffer(buf, scanner);
/** Parse the rule file */
rc = dbfw_yyparse(scanner);
dbfw_yy_delete_buffer(buf, scanner);
dbfw_yylex_destroy(scanner);
fclose(file);
if (rc == 0 && process_user_templates(instance, pstack.templates, pstack.rule))
{
instance->rules = pstack.rule;
}
else
{
rc = 1;
free_rules(pstack.rule);
MXS_ERROR("Failed to process rule file '%s'.", filename);
}
free_user_templates(pstack.templates);
strlink_free(pstack.active_rules);
strlink_free(pstack.user);
} }
else else
{ {
rc = 1; char errbuf[STRERROR_BUFLEN];
free_rules(pstack.rule); MXS_ERROR("Failed to open rule file '%s': %d, %s", filename, errno,
MXS_ERROR("Failed to process rule file '%s'.", filename); strerror_r(errno, errbuf, sizeof(errbuf)));
}
free_user_templates(pstack.templates); }
strlink_free(pstack.active_rules);
strlink_free(pstack.user);
return rc == 0; return rc == 0;
} }