Fix: use zmalloc in lttng enable_events.c

[lttng-tools.git] / src / bin / lttng / commands / enable_events.c

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index cba349e636abafc520fdddf72c72832e91cc2b84..c15edf5fd3deaaeeba49fc86345180475588d288 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -422,7 +422,10 @@ char *print_exclusions(int count, char **names)
 
        /* add length of preamble + one for NUL - one for last (missing) comma */
        length += strlen(preamble);
-       ret = malloc(length);
+       ret = zmalloc(length);
+       if (!ret) {
+               return NULL;
+       }
        strncpy(ret, preamble, length);
        for (i = 0; i < count; i++) {
                strcat(ret, names[i]);
@@ -637,7 +640,7 @@ static int enable_events(char *session_name)
                                                        msg,
                                                        print_channel_name(channel_name),
                                                        session_name);
-                                       error = 1;
+                                       ret = CMD_ERROR;
                                        break;
                                }
                                default:
@@ -720,7 +723,7 @@ static int enable_events(char *session_name)
                                                        msg,
                                                        print_channel_name(channel_name),
                                                        session_name, opt_filter);
-                                       error = 1;
+                                       ret = CMD_ERROR;
                                        break;
                                }
                                default:
@@ -898,6 +901,7 @@ static int enable_events(char *session_name)
                                                        event_name,
                                                        exclusion_string,
                                                        print_channel_name(channel_name), session_name);
+                                       warn = 1;
                                        break;
                                case LTTNG_ERR_TRACE_ALREADY_STARTED:
                                {
@@ -907,7 +911,7 @@ static int enable_events(char *session_name)
                                                        msg,
                                                        print_channel_name(channel_name),
                                                        session_name);
-                                       error = 1;
+                                       ret = CMD_ERROR;
                                        break;
                                }
                                default:
@@ -918,9 +922,9 @@ static int enable_events(char *session_name)
                                                                ? print_raw_channel_name(channel_name)
                                                                : print_channel_name(channel_name),
                                                        session_name);
+                                       warn = 1;
                                        break;
                                }
-                               warn = 1;
                        } else {
                                MSG("%s event %s%s created in channel %s",
                                                get_domain_str(dom.type), event_name,
@@ -954,7 +958,7 @@ static int enable_events(char *session_name)
                                                        msg,
                                                        print_channel_name(channel_name),
                                                        session_name, opt_filter);
-                                       error = 1;
+                                       ret = CMD_ERROR;
                                        break;
                                }
                                default: