projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: filter: memory leak in filter_parser_ctx
[lttng-tools.git]
/
src
/
lib
/
lttng-ctl
/
filter
/
filter-parser.y
diff --git
a/src/lib/lttng-ctl/filter/filter-parser.y
b/src/lib/lttng-ctl/filter/filter-parser.y
index d1ea3a1a9d533e0f14c6e4534e5bc36e65b16be3..5853510a202ebde8f1dc5d9f092e9a6cc00c66ff 100644
(file)
--- a/
src/lib/lttng-ctl/filter/filter-parser.y
+++ b/
src/lib/lttng-ctl/filter/filter-parser.y
@@
-93,7
+93,7
@@
end:
* gsrc will be garbage collected immediately, and gstr might be.
* Should only be used to append characters to a string literal or constant.
*/
* gsrc will be garbage collected immediately, and gstr might be.
* Should only be used to append characters to a string literal or constant.
*/
-LTTNG_HIDDEN
+static
struct gc_string *gc_string_append(struct filter_parser_ctx *parser_ctx,
struct gc_string *gstr,
struct gc_string *gsrc)
struct gc_string *gc_string_append(struct filter_parser_ctx *parser_ctx,
struct gc_string *gstr,
struct gc_string *gsrc)
@@
-185,17
+185,11
@@
static struct filter_node *make_op_node(struct filter_parser_ctx *scanner,
return node;
}
return node;
}
-LTTNG_HIDDEN
+static
void yyerror(struct filter_parser_ctx *parser_ctx, yyscan_t scanner, const char *str)
{
fprintf(stderr, "error %s\n", str);
}
void yyerror(struct filter_parser_ctx *parser_ctx, yyscan_t scanner, const char *str)
{
fprintf(stderr, "error %s\n", str);
}
-
-LTTNG_HIDDEN
-int yywrap(void)
-{
- return 1;
-}
#define parse_error(parser_ctx, str) \
do { \
#define parse_error(parser_ctx, str) \
do { \
@@
-286,16
+280,29
@@
void filter_parser_ctx_free(struct filter_parser_ctx *parser_ctx)
{
int ret;
{
int ret;
- free_strings(&parser_ctx->allocated_strings);
- filter_ast_free(parser_ctx->ast);
ret = yylex_destroy(parser_ctx->scanner);
if (ret)
fprintf(stderr, "yylex_destroy error\n");
ret = yylex_destroy(parser_ctx->scanner);
if (ret)
fprintf(stderr, "yylex_destroy error\n");
+
+ filter_ast_free(parser_ctx->ast);
+ free_strings(&parser_ctx->allocated_strings);
+ filter_ir_free(parser_ctx);
+ free(parser_ctx->bytecode);
+ free(parser_ctx->bytecode_reloc);
+
free(parser_ctx);
}
%}
free(parser_ctx);
}
%}
+%code provides
+{
+#include "common/macros.h"
+
+LTTNG_HIDDEN
+void setstring(struct filter_parser_ctx *parser_ctx, YYSTYPE *lvalp, const char *src);
+}
+
%define api.pure
/* %locations */
%parse-param {struct filter_parser_ctx *parser_ctx}
%define api.pure
/* %locations */
%parse-param {struct filter_parser_ctx *parser_ctx}
This page took
0.02509 seconds
and
4
git commands to generate.