From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 30 Apr 2019 23:09:24 +0000 (-0400)
Subject: Fix: getenv can return null
X-Git-Tag: v2.11.0-rc2~11
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2b8ce248da4695b1efaea2a36c5bc828ec8bea64;p=lttng-tools.git

Fix: getenv can return null

On system with LANG not defined getenv will return null.

An example of such system is the lava runner used by ci.lttng.org.

https://ci.lttng.org/view/System%20Tests/

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/time.c b/src/common/time.c
index 5519e3ab4..a01c16df5 100644
--- a/src/common/time.c
+++ b/src/common/time.c
@@ -76,7 +76,7 @@ void __attribute__((constructor)) init_locale_utf8_support(void)
 
 	if (program_locale && strstr(program_locale, "utf8")) {
 		utf8_output_supported = true;
-	} else if (strstr(lang, "utf8")) {
+	} else if (lang && strstr(lang, "utf8")) {
 		utf8_output_supported = true;
 	}
 }