From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sun, 30 Aug 2015 21:43:45 +0000 (-0400)
Subject: Fix: UTF-8 characters may be stored on up to 4 bytes
X-Git-Tag: v2.7.0-rc2~120
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=79e71bf5a317ec14b1e02fe35ccf2ad52c14883c;p=lttng-tools.git

Fix: UTF-8 characters may be stored on up to 4 bytes

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

diff --git a/src/common/config/config.c b/src/common/config/config.c
index 03601be48..140f3b6dc 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -340,11 +340,10 @@ static xmlChar *encode_string(const char *in_str)
 
 	in_len = strlen(in_str);
 	/*
-	 * Add 1 byte for the NULL terminted character. The factor 2 here is
-	 * because UTF-8 can be on two bytes so this fits the worst case for each
-	 * bytes.
+	 * Add 1 byte for the NULL terminted character. The factor 4 here is
+	 * used because UTF-8 characters can take up to 4 bytes.
 	 */
-	out_len = (in_len * 2) + 1;
+	out_len = (in_len * 4) + 1;
 	out_str = xmlMalloc(out_len);
 	if (!out_str) {
 		goto end;