From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 26 Feb 2021 18:58:16 +0000 (-0500)
Subject: Clean-up: uri_parse_str_urls: assert on invalid uri_parse() return values
X-Git-Tag: v2.13.0-rc1~307
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=05932fe8da075311149e8b2608a70fc0e3be3187

Clean-up: uri_parse_str_urls: assert on invalid uri_parse() return values

uri_parse() can only ever return values [-1, 2] and callers only handle
those values. This causes Coverity to report possible leaks and other
errors when analyzing callers.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ida29691420228f0425cc908641bcd85208d66236
---

diff --git a/src/common/uri.c b/src/common/uri.c
index 0638aebd9..0f89468c5 100644
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -577,6 +577,9 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
 			goto parse_error;
 		}
 
+		/* 1 and 2 are the only expected values on success. */
+		assert(size_ctrl == 1 || size_ctrl == 2);
+
 		/* At this point, we know there is at least one URI in the array */
 		set_default_uri_attr(&ctrl_uris[0], LTTNG_STREAM_CONTROL);
 
@@ -614,6 +617,9 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
 		} else if (size_data == 2) {
 			ERR("Data URL can not be set with the net[4|6]:// protocol");
 			goto error;
+		} else {
+			/* 1 and 2 are the only expected values on success. */
+			assert(size_data == 1);
 		}
 
 		set_default_uri_attr(&data_uris[0], LTTNG_STREAM_DATA);