X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ffilter%2Ffilter-parser.y;h=12605cd382b8af4d65c3d59b7076b3d982870af5;hp=d746f78e8d82918c6109170e6fced1f1b70a5dca;hb=661dfdd190c65bad5a044e21c1d5f9ad59144bf8;hpb=8ab7c0d9aa6d5dd0289a8ebc42b743ff0ac649c6

diff --git a/src/lib/lttng-ctl/filter/filter-parser.y b/src/lib/lttng-ctl/filter/filter-parser.y
index d746f78e8..12605cd38 100644
--- a/src/lib/lttng-ctl/filter/filter-parser.y
+++ b/src/lib/lttng-ctl/filter/filter-parser.y
@@ -89,9 +89,13 @@ static struct gc_string *gc_string_alloc(struct filter_parser_ctx *parser_ctx,
 	for (alloclen = 8; alloclen < sizeof(long) + sizeof(*gstr) + len;
 	     alloclen *= 2);
 
-	gstr = malloc(alloclen);
+	gstr = zmalloc(alloclen);
+	if (!gstr) {
+		goto end;
+	}
 	cds_list_add(&gstr->gc, &parser_ctx->allocated_strings);
 	gstr->alloclen = alloclen;
+end:
 	return gstr;
 }
 
@@ -143,7 +147,7 @@ static struct filter_node *make_node(struct filter_parser_ctx *scanner,
 	struct filter_ast *ast = filter_parser_get_ast(scanner);
 	struct filter_node *node;
 
-	node = malloc(sizeof(*node));
+	node = zmalloc(sizeof(*node));
 	if (!node)
 		return NULL;
 	memset(node, 0, sizeof(*node));
@@ -180,7 +184,7 @@ static struct filter_node *make_op_node(struct filter_parser_ctx *scanner,
 	struct filter_ast *ast = filter_parser_get_ast(scanner);
 	struct filter_node *node;
 
-	node = malloc(sizeof(*node));
+	node = zmalloc(sizeof(*node));
 	if (!node)
 		return NULL;
 	memset(node, 0, sizeof(*node));
@@ -222,7 +226,7 @@ static struct filter_ast *filter_ast_alloc(void)
 {
 	struct filter_ast *ast;
 
-	ast = malloc(sizeof(*ast));
+	ast = zmalloc(sizeof(*ast));
 	if (!ast)
 		return NULL;
 	memset(ast, 0, sizeof(*ast));
@@ -254,7 +258,7 @@ struct filter_parser_ctx *filter_parser_ctx_alloc(FILE *input)
 
 	yydebug = filter_parser_debug;
 
-	parser_ctx = malloc(sizeof(*parser_ctx));
+	parser_ctx = zmalloc(sizeof(*parser_ctx));
 	if (!parser_ctx)
 		return NULL;
 	memset(parser_ctx, 0, sizeof(*parser_ctx));
@@ -467,6 +471,12 @@ primary_expression
 postfix_expression
 	: primary_expression
 		{	$$ = $1;					}
+	| postfix_expression LSBRAC unary_expression RSBRAC
+		{
+			$$ = $1;
+			$$->u.expression.pre_op = AST_LINK_BRACKET;
+			$$->u.expression.next = $3;
+		}
 	| postfix_expression DOT IDENTIFIER
 		{
 			$$ = make_node(parser_ctx, NODE_EXPRESSION);