X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=c93f93dc9add8333c07470688ae95f14a8f1ec80;hb=09a90bcd757486eebb38d6d6023c603d9af72b4e;hp=81b1f418a97b78a5a01ed7300f50fd2d38f0413d;hpb=d8fbe2a9cc6ace367bfb5428df3e7649ac012f32;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 81b1f418a..c93f93dc9 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1579,12 +1579,15 @@ int ust_app_list_events(struct lttng_event **events)
 						&uiter)) != -ENOENT) {
 			health_code_update(&health_thread_cmd);
 			if (count >= nbmem) {
+				/* In case the realloc fails, we free the memory */
+				void *tmp_ptr = (void *) tmp;
 				DBG2("Reallocating event list from %zu to %zu entries", nbmem,
 						2 * nbmem);
 				nbmem *= 2;
 				tmp = realloc(tmp, nbmem * sizeof(struct lttng_event));
 				if (tmp == NULL) {
 					PERROR("realloc ust app events");
+					free(tmp_ptr);
 					ret = -ENOMEM;
 					goto rcu_error;
 				}
@@ -1654,12 +1657,15 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 						&uiter)) != -ENOENT) {
 			health_code_update(&health_thread_cmd);
 			if (count >= nbmem) {
+				/* In case the realloc fails, we free the memory */
+				void *tmp_ptr = (void *) tmp;
 				DBG2("Reallocating event field list from %zu to %zu entries", nbmem,
 						2 * nbmem);
 				nbmem *= 2;
 				tmp = realloc(tmp, nbmem * sizeof(struct lttng_event_field));
 				if (tmp == NULL) {
 					PERROR("realloc ust app event fields");
+					free(tmp_ptr);
 					ret = -ENOMEM;
 					goto rcu_error;
 				}
@@ -1667,7 +1673,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 
 			memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
 			tmp[count].type = uiter.type;
-			tmp[count].written = uiter.written;
+			tmp[count].nowrite = uiter.nowrite;
 
 			memcpy(tmp[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
 			tmp[count].event.loglevel = uiter.loglevel;
@@ -2239,7 +2245,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 			/* Order is important */
 			cds_list_add_tail(&ustream->list, &ua_chan->streams.head);
 			ret = snprintf(ustream->name, sizeof(ustream->name), "%s_%u",
-					ua_chan->name, ua_chan->streams.count++);
+					ua_chan->name, ua_chan->streams.count);
+			ua_chan->streams.count++;
 			if (ret < 0) {
 				PERROR("asprintf UST create stream");
 				/*