Module: check_mk
Branch: master
Commit: eb50d0187a9bec6b2841fe33c3e97e2325cffd88
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb50d0187a9bec…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jun 7 08:47:42 2018 +0200
6012 FIX Fixed CMC crash for malformed rrddata queries.
Malformed Livestatus queries involving the "rrddata" column could cause a
CMC crash, this has been fixed.
Change-Id: Iffdd595bba25c9198adb5f08f14cde87fc90127d
---
.werks/6012 | 11 +++++++++++
livestatus/src/Query.cc | 5 +++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.werks/6012 b/.werks/6012
new file mode 100644
index 0000000..3bce9bc
--- /dev/null
+++ b/.werks/6012
@@ -0,0 +1,11 @@
+Title: Fixed CMC crash for malformed rrddata queries.
+Level: 1
+Component: livestatus
+Compatible: compat
+Edition: cee
+Version: 1.6.0i1
+Date: 1528353877
+Class: fix
+
+Malformed Livestatus queries involving the "rrddata" column could cause a
+CMC crash, this has been fixed.
diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc
index 1d7f19a..ae36426 100644
--- a/livestatus/src/Query.cc
+++ b/livestatus/src/Query.cc
@@ -458,8 +458,9 @@ void Query::parseColumnsLine(char *line) {
// But not failing has the advantage that an updated GUI, that
// expects new columns, will be able to keep compatibility with
// older Livestatus versions.
- Informational(_logger) << "replacing non-existing column
'"
- << column_name << "' with null
column";
+ Informational(_logger)
+ << "replacing non-existing column '" <<
column_name
+ << "' with null column, reason: " << e.what();
column = std::make_shared<NullColumn>(
column_name, "non-existing column", -1, -1, -1, 0);
}