From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 26 Nov 2014 17:36:37 +0000 (-0500)
Subject: Fix: filter-parser.y: use zmalloc(), missing OOM check
X-Git-Tag: v2.6.0-rc4~18
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8ac434669c68d1301365ffef178287f3e060852b;p=lttng-tools.git

Fix: filter-parser.y: use zmalloc(), missing OOM check

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/lib/lttng-ctl/filter/filter-parser.y b/src/lib/lttng-ctl/filter/filter-parser.y
index d746f78e8..92499e075 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));