diff --git a/src/common/event-field-value.cpp b/src/common/event-field-value.cpp index 8017fd081..baa3972ff 100644 --- a/src/common/event-field-value.cpp +++ b/src/common/event-field-value.cpp @@ -183,8 +183,16 @@ struct lttng_event_field_value *lttng_event_field_value_string_create_with_size( goto error; } - LTTNG_ASSERT(val); - field_val->val = strndup(val, size); + if (size) { + LTTNG_ASSERT(val); + field_val->val = strndup(val, size); + } else { + /* + * User code do not expect a NULL string pointer. Populate with + * an empty string when length is 0. + */ + field_val->val = strdup(""); + } if (!field_val->val) { goto error; }