Skip to contentSkip to conversation

perf expr: Fix memory leaks in metric bison

PATCH Applied Ian Rogers 3 participants 3 messages May 13, 2020 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf expr: Fix memory leaks in metric bison

Add a destructor for strings to reclaim memory in the event of errors. Free the ID given for a lookup, it was previously strdup-ed in the lex code.

---
 tools/perf/util/expr.y | 3 +++
 1 file changed, 3 insertions(+)
tools/perf/util/expr.y +3 -0
index 21e82a1e11a2..3b49b230b111 100644
@@ -27,6 +27,7 @@
 %token EXPR_PARSE EXPR_OTHER EXPR_ERROR
 %token <num> NUMBER
 %token <str> ID
+%destructor { free ($$); } <str>
 %token MIN MAX IF ELSE SMT_ON
 %left MIN MAX IF
 %left '|'
@@ -94,8 +95,10 @@ if_expr:
 expr:	  NUMBER
 	| ID			{ if (lookup_id(ctx, $1, &$$) < 0) {
 					pr_debug("%s not found\n", $1);
+					free($1);
 					YYABORT;
 				  }
+				  free($1);
 				}
 	| expr '|' expr		{ $$ = (long)$1 | (long)$3; }
 	| expr '&' expr		{ $$ = (long)$1 & (long)$3; }
Signature · 1 line
2.26.2.645.ge9eca65c58-goog
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Ian Rogers

Add a destructor for strings to reclaim memory in the event of errors. Free the ID given for a lookup, it was previously strdup-ed in the lex code.

thanks,
jirka

Quoted 30 lines
---
 tools/perf/util/expr.y | 3 +++
 1 file changed, 3 insertions(+)
tools/perf/util/expr.y +3 -0
index 21e82a1e11a2..3b49b230b111 100644
@@ -27,6 +27,7 @@
 %token EXPR_PARSE EXPR_OTHER EXPR_ERROR
 %token <num> NUMBER
 %token <str> ID
+%destructor { free ($$); } <str>
 %token MIN MAX IF ELSE SMT_ON
 %left MIN MAX IF
 %left '|'
@@ -94,8 +95,10 @@ if_expr:
 expr:	  NUMBER
 	| ID			{ if (lookup_id(ctx, $1, &$$) < 0) {
 					pr_debug("%s not found\n", $1);
+					free($1);
 					YYABORT;
 				  }
+				  free($1);
 				}
 	| expr '|' expr		{ $$ = (long)$1 | (long)$3; }
 	| expr '&' expr		{ $$ = (long)$1 & (long)$3; }
Signature · 1 line
2.26.2.645.ge9eca65c58-goog