summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c9cb3e7)
Also add a check for a NULL pointer when freeing the filter bytecode so
we don't deref an invalid ptr.
Signed-off-by: David Goulet <dgoulet@efficios.com>
LTTNG_HIDDEN
void filter_bytecode_free(struct filter_parser_ctx *ctx)
{
LTTNG_HIDDEN
void filter_bytecode_free(struct filter_parser_ctx *ctx)
{
+ if (!ctx) {
+ return;
+ }
+
if (ctx->bytecode) {
free(ctx->bytecode);
ctx->bytecode = NULL;
if (ctx->bytecode) {
free(ctx->bytecode);
ctx->bytecode = NULL;
+ LTTNG_SYMBOL_NAME_LEN * exclusion_count);
if (!varlen_data) {
ret = -LTTNG_ERR_EXCLUSION_NOMEM;
+ LTTNG_SYMBOL_NAME_LEN * exclusion_count);
if (!varlen_data) {
ret = -LTTNG_ERR_EXCLUSION_NOMEM;
}
/* Put exclusion names first in the data */
}
/* Put exclusion names first in the data */
lsm.u.enable.bytecode_len + lsm.u.enable.expression_len, NULL);
free(varlen_data);
lsm.u.enable.bytecode_len + lsm.u.enable.expression_len, NULL);
free(varlen_data);
-filter_error:
- if (filter_expression) {
+mem_error:
+ if (filter_expression && ctx) {
filter_bytecode_free(ctx);
filter_ir_free(ctx);
filter_parser_ctx_free(ctx);
filter_bytecode_free(ctx);
filter_ir_free(ctx);
filter_parser_ctx_free(ctx);
- if (free_filter_expression) {
- /*
- * The filter expression has been replaced and must be
- * freed as it is not the original filter expression
- * received as a parameter.
- */
- free(filter_expression);
- }
+ }
+filter_error:
+ if (free_filter_expression) {
+ /*
+ * The filter expression has been replaced and must be freed as it is
+ * not the original filter expression received as a parameter.
+ */
+ free(filter_expression);