From fa64dfb477cac50bb0b8a02fcf6b5a16a426d43b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 7 Nov 2014 16:10:46 -0500 Subject: [PATCH] Bypass 0 byte allocation when no domains are enabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/cmd.c | 6 +++++- src/bin/lttng-sessiond/main.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index d882b074d..98e090539 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -2388,6 +2388,10 @@ ssize_t cmd_list_domains(struct ltt_session *session, } } + if (!nb_dom) { + goto end; + } + *domains = zmalloc(nb_dom * sizeof(struct lttng_domain)); if (*domains == NULL) { ret = LTTNG_ERR_FATAL; @@ -2413,7 +2417,7 @@ ssize_t cmd_list_domains(struct ltt_session *session, } } } - +end: return nb_dom; error: diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index 699d53323..c8484b93c 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -3474,7 +3474,7 @@ skip_domain: case LTTNG_LIST_DOMAINS: { ssize_t nb_dom; - struct lttng_domain *domains; + struct lttng_domain *domains = NULL; nb_dom = cmd_list_domains(cmd_ctx->session, &domains); if (nb_dom < 0) { -- 2.34.1