Issue introduced by upstream commit:
commit
27f4b6094f399f2fe231b58801dce98cbd21baa9
Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue Sep 4 12:17:07 2012 -0400
Fix filter: pointer to string, not string, should be on stack
Fixes #329
Reported-by: David Bryant <david.bryant@quantum.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
{ \
unsigned long __ctf_tmp_ulong = (unsigned long) (_length); \
#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
{ \
unsigned long __ctf_tmp_ulong = (unsigned long) (_length); \
+ void *__ctf_tmp_ptr = (_src); \
memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
__stack_data += sizeof(unsigned long); \
memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
__stack_data += sizeof(unsigned long); \
- memcpy(__stack_data, &(_src), sizeof(void **)); \
+ memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **)); \
__stack_data += sizeof(void **); \
}
__stack_data += sizeof(void **); \
}
_src_length, _encoding, _nowrite) \
{ \
unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \
_src_length, _encoding, _nowrite) \
{ \
unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \
+ void *__ctf_tmp_ptr = (_src); \
memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
__stack_data += sizeof(unsigned long); \
memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
__stack_data += sizeof(unsigned long); \
- memcpy(__stack_data, &(_src), sizeof(void **)); \
+ memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **)); \
__stack_data += sizeof(void **); \
}
#undef _ctf_string
#define _ctf_string(_item, _src, _nowrite) \
{ \
__stack_data += sizeof(void **); \
}
#undef _ctf_string
#define _ctf_string(_item, _src, _nowrite) \
{ \
- memcpy(__stack_data, &(_src), sizeof(void **)); \
+ void *__ctf_tmp_ptr = (_src); \
+ memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **)); \
__stack_data += sizeof(void **); \
}
__stack_data += sizeof(void **); \
}