mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-04 00:05:14 +00:00
Code Issues Releases Wiki Activity

parser: fix memory leaks in variable failure cases

Browse Source 
This patch frees some leaked memory that occur when errors are
detected while adding variables to the parser's symbol table. While not
a significant issue currently due to the parser exiting on failures, as
the process of library-ifying the parser continues, these need to be
addressed. It also makes it easier to use tools like Address Sanitizer
on the parser against our test suite.

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Steve Beattie
2016-01-25 15:27:16 -08:00
parent 2a81e30d5b
commit 61a7b23757
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
parser/parser_yacc.y
View File

@@ -419,14 +419,17 @@ varassign: TOK_SET_VAR TOK_EQUALS valuelist
PDEBUG("Matched: set assignment for (%s)\n", $1); PDEBUG("Matched: set assignment for (%s)\n", $1);
err = new_set_var(var_name, list->value); err = new_set_var(var_name, list->value);
if (err) { if (err) {
free(var_name);
yyerror("variable %s was previously declared", $1); yyerror("variable %s was previously declared", $1);
/* FIXME: it'd be handy to report the previous location */ /* FIXME: it'd be handy to report the previous location */
} }
for (list = list->next; list; list = list->next) { for (list = list->next; list; list = list->next) {
err = add_set_value(var_name, list->value); err = add_set_value(var_name, list->value);
if (err) if (err) {
free(var_name);
yyerror("Error adding %s to set var %s", yyerror("Error adding %s to set var %s",
list->value, $1); list->value, $1);
}
} }
free_value_list($3); free_value_list($3);
free(var_name); free(var_name);
@@ -445,13 +448,16 @@ varassign: TOK_SET_VAR TOK_ADD_ASSIGN valuelist
* failures are indicative of symtab failures */ * failures are indicative of symtab failures */
err = add_set_value(var_name, list->value); err = add_set_value(var_name, list->value);
if (err) { if (err) {
free(var_name);
yyerror("variable %s was not previously declared, but is being assigned additional values", $1); yyerror("variable %s was not previously declared, but is being assigned additional values", $1);
} }
for (list = list->next; list; list = list->next) { for (list = list->next; list; list = list->next) {
err = add_set_value(var_name, list->value); err = add_set_value(var_name, list->value);
if (err) if (err) {
free(var_name);
yyerror("Error adding %s to set var %s", yyerror("Error adding %s to set var %s",
list->value, $1); list->value, $1);
}
} }
free_value_list($3); free_value_list($3);
free(var_name); free(var_name);
@@ -469,11 +475,11 @@ varassign: TOK_BOOL_VAR TOK_EQUALS TOK_VALUE
$1, $3); $1, $3);
} }
err = add_boolean_var(var_name, boolean); err = add_boolean_var(var_name, boolean);
free(var_name);
if (err) { if (err) {
yyerror("variable %s was previously declared", $1); yyerror("variable %s was previously declared", $1);
/* FIXME: it'd be handy to report the previous location */ /* FIXME: it'd be handy to report the previous location */
} }
free(var_name);
free($1); free($1);
free($3); free($3);
} }