Merged in master and stable-2.11. Thanks! Jérémie
On Thu, Mar 28, 2019 at 03:07:43PM -0400, Yannick Lamarre wrote: > Signed-off-by: Yannick Lamarre <ylama...@efficios.com> > --- > src/lib/lttng-ctl/lttng-ctl.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c > index 165fef4d..92634c00 100644 > --- a/src/lib/lttng-ctl/lttng-ctl.c > +++ b/src/lib/lttng-ctl/lttng-ctl.c > @@ -1078,7 +1078,11 @@ int lttng_enable_event_with_exclusions(struct > lttng_handle *handle, > unsigned int free_filter_expression = 0; > struct filter_parser_ctx *ctx = NULL; > > - memset(&send_buffer, 0, sizeof(send_buffer)); > + /* > + * We have either a filter or some exclusions, so we need to set up > + * a variable-length memory block from where to send the data. > + */ > + lttng_dynamic_buffer_init(&send_buffer); > > /* > * Cast as non-const since we may replace the filter expression > @@ -1128,12 +1132,6 @@ int lttng_enable_event_with_exclusions(struct > lttng_handle *handle, > lsm.u.enable.exclusion_count = exclusion_count; > lsm.u.enable.bytecode_len = 0; > > - /* > - * We have either a filter or some exclusions, so we need to set up > - * a variable-length memory block from where to send the data. > - */ > - lttng_dynamic_buffer_init(&send_buffer); > - > /* Parse filter expression. */ > if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL > || handle->domain.type == LTTNG_DOMAIN_LOG4J > -- > 2.11.0 > _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
