Fix filter: pointer to string, not string, should be on stack

Fixes #329

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 398f3efae5d44fcc0193e8e37016b6314dd7e06e..30414e8176c73c891b0b8a3994693447c5d10d91 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -298,7 +298,7 @@ size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
                unsigned long __ctf_tmp_ulong = (unsigned long) (_length);     \
                memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
                __stack_data += sizeof(unsigned long);                         \
-               memcpy(__stack_data, (_src), sizeof(void **));                 \
+               memcpy(__stack_data, &(_src), sizeof(void **));                \
                __stack_data += sizeof(void **);                               \
        }
 
@@ -309,15 +309,15 @@ size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
                unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \
                memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
                __stack_data += sizeof(unsigned long);                         \
-               memcpy(__stack_data, (_src), sizeof(void **));                 \
+               memcpy(__stack_data, &(_src), sizeof(void **));                \
                __stack_data += sizeof(void **);                               \
        }
 
 #undef _ctf_string
 #define _ctf_string(_item, _src, _written)                                    \
        {                                                                      \
-               memcpy(__stack_data, (_src), sizeof(void **));                 \
-               __stack_data += sizeof(void *);                                \
+               memcpy(__stack_data, &(_src), sizeof(void **));                \
+               __stack_data += sizeof(void **);                               \
        }
 
 #undef TP_ARGS