From 96d0248acf6775375dd69fb5574c2c5283e54052 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 23 Apr 2015 17:13:41 -0400 Subject: [PATCH] Fix: string length calculation reversed user vs kernel args Only affects feature recently merged into master. Signed-off-by: Mathieu Desnoyers --- probes/lttng-events.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/probes/lttng-events.h b/probes/lttng-events.h index 58f4e120..a6c36b08 100644 --- a/probes/lttng-events.h +++ b/probes/lttng-events.h @@ -327,10 +327,10 @@ static void __event_probe__##_name(void *__data); #define _ctf_string(_item, _src, _user, _nowrite) \ if (_user) \ __event_len += __dynamic_len[__dynamic_len_idx++] = \ - strlen(_src) + 1; \ + max_t(size_t, lttng_strlen_user_inatomic(_src), 1); \ else \ __event_len += __dynamic_len[__dynamic_len_idx++] = \ - max_t(size_t, lttng_strlen_user_inatomic(_src), 1); + strlen(_src) + 1; #undef TP_PROTO #define TP_PROTO(...) __VA_ARGS__ -- 2.34.1