Do not permit NULL pointer on enable API calls
authorDavid Goulet <david.goulet@polymtl.ca>
Thu, 24 Nov 2011 20:22:31 +0000 (15:22 -0500)
committerDavid Goulet <david.goulet@polymtl.ca>
Thu, 24 Nov 2011 20:22:31 +0000 (15:22 -0500)
Enable channel lttng API call now forbids the use of NULL pointer for
channel attributes.

Use lttng_channel_set_default_attr() before.

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
liblttngctl/lttngctl.c

index fc6ff3cc1ac92b41e28184dd04dc03944ba054ce..c91a242f32a246c9f021ac99ddb40f0c0ab66dde 100644 (file)
@@ -496,10 +496,11 @@ int lttng_enable_event(struct lttng_handle *handle,
 {
        struct lttcomm_session_msg lsm;
 
-       if (!handle || ev == NULL) {
+       if (handle == NULL || ev == NULL) {
                return -1;
        }
 
+       /* If no channel name, we put the default name */
        if (channel_name == NULL) {
                copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME,
                                sizeof(lsm.u.enable.channel_name));
@@ -566,13 +567,14 @@ int lttng_enable_channel(struct lttng_handle *handle,
 {
        struct lttcomm_session_msg lsm;
 
-       if (!handle) {
+       /*
+        * NULL arguments are forbidden. No default values.
+        */
+       if (handle == NULL || chan == NULL) {
                return -1;
        }
 
-       if (chan) {
-               memcpy(&lsm.u.channel.chan, chan, sizeof(lsm.u.channel.chan));
-       }
+       memcpy(&lsm.u.channel.chan, chan, sizeof(lsm.u.channel.chan));
 
        lsm.cmd_type = LTTNG_ENABLE_CHANNEL;
 
This page took 0.033995 seconds and 4 git commands to generate.