X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=faf35cc7fc8f8a42c927325a15a161bd69215148;hb=15dc512ac8cf2f59c8779f442f116a23975c950c;hp=9e7826808f7181b9546de2d69956e1820e6515c4;hpb=fac41e72fd9335dd3ab372a74b96dff5dc2cdbdf;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 9e7826808..faf35cc7f 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -602,7 +602,7 @@ error:
  */
 ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 {
-	int fd, pos, ret;
+	int fd, ret;
 	char *event;
 	size_t nbmem, count = 0;
 	FILE *fp;
@@ -634,15 +634,15 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 		goto end;
 	}
 
-	while (fscanf(fp, "event { name = %m[^;]; };%n\n", &event, &pos) == 1) {
+	while (fscanf(fp, "event { name = %m[^;]; };\n", &event) == 1) {
 		if (count >= nbmem) {
 			struct lttng_event *new_elist;
+			size_t new_nbmem;
 
-			DBG("Reallocating event list from %zu to %zu bytes", nbmem,
-					nbmem * 2);
-			/* Double the size */
-			nbmem <<= 1;
-			new_elist = realloc(elist, nbmem * sizeof(struct lttng_event));
+			new_nbmem = nbmem << 1;
+			DBG("Reallocating event list from %zu to %zu bytes",
+					nbmem, new_nbmem);
+			new_elist = realloc(elist, new_nbmem * sizeof(struct lttng_event));
 			if (new_elist == NULL) {
 				PERROR("realloc list events");
 				free(event);
@@ -650,6 +650,10 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 				count = -ENOMEM;
 				goto end;
 			}
+			/* Zero the new memory */
+			memset(new_elist + nbmem, 0,
+				(new_nbmem - nbmem) * sizeof(struct lttng_event));
+			nbmem = new_nbmem;
 			elist = new_elist;
 		}
 		strncpy(elist[count].name, event, LTTNG_SYMBOL_NAME_LEN);
@@ -755,11 +759,11 @@ void kernel_destroy_session(struct ltt_kernel_session *ksess)
 	DBG("Tearing down kernel session");
 
 	/*
-	 * Destroy channels on the consumer if in no output mode because the
-	 * streams are in *no* monitor mode so we have to send a command to clean
-	 * them up or else they leaked.
+	 * Destroy channels on the consumer if at least one FD has been sent and we
+	 * are in no output mode because the streams are in *no* monitor mode so we
+	 * have to send a command to clean them up or else they leaked.
 	 */
-	if (!ksess->output_traces) {
+	if (!ksess->output_traces && ksess->consumer_fds_sent) {
 		int ret;
 		struct consumer_socket *socket;
 		struct lttng_ht_iter iter;