Fix possible null pointer

[lttng-tools.git] / liblttngctl / liblttngctl.c

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index cad4d735eed17aff794aa5aae95892f505198ef0..e05496a9449891f5f6174af5ed4de3c9ce1f5f0e 100644 (file)
--- a/liblttngctl/liblttngctl.c
+++ b/liblttngctl/liblttngctl.c
@@ -251,6 +251,24 @@ int lttng_stop_tracing(char *session_name)
  * BEGIN Kernel control API
  */
 
+/*
+ *  lttng_kernel_add_context
+ */
+int lttng_kernel_add_context(struct lttng_kernel_context *ctx,
+               char *event_name, char *channel_name)
+{
+       if (channel_name != NULL) {
+               strncpy(lsm.u.context.channel_name, channel_name, NAME_MAX);
+       }
+
+       if (event_name != NULL) {
+               strncpy(lsm.u.context.event_name, event_name, NAME_MAX);
+       }
+
+       memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_kernel_context));
+       return ask_sessiond(LTTNG_KERNEL_ADD_CONTEXT, NULL);
+}
+
 /*
  *  lttng_kernel_enable_event
  */
@@ -258,7 +276,7 @@ int lttng_kernel_enable_event(struct lttng_event *ev, char *channel_name)
 {
        int ret;
 
-       if (strlen(channel_name) == 0) {
+       if (channel_name == NULL) {
                strncpy(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
        } else {
                strncpy(lsm.u.enable.channel_name, channel_name, NAME_MAX);
@@ -283,7 +301,7 @@ int lttng_kernel_disable_event(char *name, char *channel_name)
 {
        int ret;
 
-       if (strlen(channel_name) == 0) {
+       if (channel_name == NULL) {
                strncpy(lsm.u.disable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
        } else {
                strncpy(lsm.u.disable.channel_name, channel_name, NAME_MAX);