From 6d6e063a0fd132c49490f01949dfa5fa28125a33 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Tue, 23 Feb 2016 20:17:41 +0100
Subject: [PATCH] libdm: fix string boundary

The test for string 'end' needs to account for ending \0,
which also needs to fit <SIZE.
---
 WHATS_NEW_DM         | 1 +
 libdm/libdm-report.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 3dbbfae73..14793b385 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.118 -
 =====================================
+  Fix string boundary check in _get_canonical_field_name().
   Always initialized hist struct in _stats_parse_histogram().
 
 Version 1.02.117 - 21st February 2016
diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index 55b5ff0e3..0163910d3 100644
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -839,8 +839,9 @@ static int _get_canonical_field_name(const char *field,
 			diff = 1;
 			continue;
 		}
-		if (i >= fcanonical_len) {
-			log_error("%s: field name too long", field);
+		if ((i + 1) >= fcanonical_len) {
+			canonical_field[0] = '\0';
+			log_error("%s: field name too long.", field);
 			return 0;
 		}
 		canonical_field[i++] = *field;