Merge branch 'master' of git://git.lttng.org/lttng-tools

[lttng-tools.git] / lttng-sessiond / trace-ust.c

diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
index a1715f2532e793b7793c6fafb3c9ae062d978898..3916c1f5de97c8dc46fdb650b2f91edd6d971bbe 100644 (file)
--- a/lttng-sessiond/trace-ust.c
+++ b/lttng-sessiond/trace-ust.c
@@ -112,13 +112,15 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
        ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path);
        if (ret < 0) {
                PERROR("snprintf kernel traces path");
-               goto error;
+               goto error_free_session;
        }
 
        DBG2("UST trace session create successful");
 
        return lus;
 
+error_free_session:
+       free(lus);
 error:
        return NULL;
 }
@@ -169,13 +171,15 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
        if (ret < 0) {
                perror("asprintf ust create channel");
-               goto error;
+               goto error_free_channel;
        }
 
        DBG2("Trace UST channel %s created", luc->name);
 
        return luc;
 
+error_free_channel:
+       free(luc);
 error:
        return NULL;
 }
@@ -210,7 +214,7 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
                break;
        default:
                ERR("Unknown ust instrumentation type (%d)", ev->type);
-               goto error;
+               goto error_free_event;
        }
 
        /* Copy event name */
@@ -221,10 +225,12 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        hashtable_node_init(&lue->node, (void *) lue->attr.name,
                        strlen(lue->attr.name));
        /* Alloc context hash tables */
-       lue->ctx = hashtable_new_str(5);
+       lue->ctx = hashtable_new_str(0);
 
        return lue;
 
+error_free_event:
+       free(lue);
 error:
        return NULL;
 }
@@ -239,7 +245,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
        int ret;
        struct ltt_ust_metadata *lum;
 
-       lum = malloc(sizeof(struct ltt_ust_metadata));
+       lum = zmalloc(sizeof(struct ltt_ust_metadata));
        if (lum == NULL) {
                perror("ust metadata malloc");
                goto error;
@@ -258,11 +264,13 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
        ret = snprintf(lum->pathname, PATH_MAX, "%s/metadata", path);
        if (ret < 0) {
                perror("asprintf ust metadata");
-               goto error;
+               goto error_free_metadata;
        }
 
        return lum;
 
+error_free_metadata:
+       free(lum);
 error:
        return NULL;
 }