From: Simon Marchi <simon.marchi@efficios.com>
Date: Fri, 2 Apr 2021 19:52:46 +0000 (-0400)
Subject: config: accept "0" and "1" as XML boolean values
X-Git-Tag: v2.13.0-rc1~109
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=47945b177017848c3c062ba2944df36265e29b71;p=lttng-tools.git

config: accept "0" and "1" as XML boolean values

These are valid values when validating a "boolean" using a schema (XSD).
Somebody could therefore write a file with

    <started>0</started>

instead of

    <started>false</started>

The file would validate against session.xsd, but we would fail after
that:

    Warning: Invalid boolean value encoutered (0).
    Error: Invalid session configuration

Reference: https://www.w3.org/TR/xmlschema11-2/#boolean

Change-Id: Icea85b13233ec01aa09ef3b578906f4c0e482088
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index 1b7d965fa..b08f40a2e 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -843,9 +843,11 @@ int parse_bool(xmlChar *str, int *val)
 		goto end;
 	}
 
-	if (!strcmp((const char *) str, config_xml_true)) {
+	if (!strcmp((const char *) str, config_xml_true) ||
+			!strcmp((const char *) str, "1")) {
 		*val = 1;
-	} else if (!strcmp((const char *) str, config_xml_false)) {
+	} else if (!strcmp((const char *) str, config_xml_false) ||
+			!strcmp((const char *) str, "0")) {
 		*val = 0;
 	} else {
 		WARN("Invalid boolean value encountered (%s).",