projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: avoid freeing invalid ptr in filter bytecode
[lttng-tools.git]
/
src
/
lib
/
lttng-ctl
/
filter
/
filter-visitor-generate-bytecode.c
diff --git
a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
index 785c1135ef6b4606bdcb76c960a7611b4b142c28..7d62757477febbcddd0a88e8f4524d74c74682a9 100644
(file)
--- a/
src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
+++ b/
src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
@@
-222,7
+222,7
@@
int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
if (!insn)
return -ENOMEM;
insn->op = FILTER_OP_LOAD_S64;
if (!insn)
return -ENOMEM;
insn->op = FILTER_OP_LOAD_S64;
-
*(int64_t *) insn->data = node->u.load.u.num
;
+
memcpy(insn->data, &node->u.load.u.num, sizeof(int64_t))
;
ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
free(insn);
return ret;
ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
free(insn);
return ret;
@@
-237,7
+237,7
@@
int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
if (!insn)
return -ENOMEM;
insn->op = FILTER_OP_LOAD_DOUBLE;
if (!insn)
return -ENOMEM;
insn->op = FILTER_OP_LOAD_DOUBLE;
-
*(double *) insn->data = node->u.load.u.flt
;
+
memcpy(insn->data, &node->u.load.u.flt, sizeof(double))
;
ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
free(insn);
return ret;
ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
free(insn);
return ret;
@@
-263,6
+263,7
@@
int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
insn->op = FILTER_OP_GET_CONTEXT_REF;
break;
default:
insn->op = FILTER_OP_GET_CONTEXT_REF;
break;
default:
+ free(insn);
return -EINVAL;
}
ref_offset.offset = (uint16_t) -1U;
return -EINVAL;
}
ref_offset.offset = (uint16_t) -1U;
@@
-519,10
+520,15
@@
int recursive_visit_gen_bytecode(struct filter_parser_ctx *ctx,
LTTNG_HIDDEN
void filter_bytecode_free(struct filter_parser_ctx *ctx)
{
LTTNG_HIDDEN
void filter_bytecode_free(struct filter_parser_ctx *ctx)
{
- free(ctx->bytecode);
- ctx->bytecode = NULL;
- free(ctx->bytecode_reloc);
- ctx->bytecode_reloc = NULL;
+ if (ctx->bytecode) {
+ free(ctx->bytecode);
+ ctx->bytecode = NULL;
+ }
+
+ if (ctx->bytecode_reloc) {
+ free(ctx->bytecode_reloc);
+ ctx->bytecode_reloc = NULL;
+ }
}
LTTNG_HIDDEN
}
LTTNG_HIDDEN
This page took
0.024494 seconds
and
5
git commands to generate.