Module: check_mk
Branch: master
Commit: 52bb998bf7c838538b1a4a06162bae8d0fee7c70
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52bb998bf7c838…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Nov 4 12:56:11 2015 +0100
#2743 FIX Fixed handling of column types in "GET columns"
Under rare circumstances the core could crash during the processing of a
columns query.
---
.werks/2743 | 11 +++++++++++
ChangeLog | 3 +++
livestatus/src/TableColumns.cc | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/2743 b/.werks/2743
new file mode 100644
index 0000000..37c5f07
--- /dev/null
+++ b/.werks/2743
@@ -0,0 +1,11 @@
+Title: Fixed handling of column types in "GET columns"
+Level: 1
+Component: livestatus
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1446637947
+
+Under rare circumstances the core could crash during the processing of a
+columns query.
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 77c20eb..04d5dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,9 @@
* 2733 Visibility of Event Console events more flexible now...
* 2719 FIX: Events Check: Links to EC were broken when using regular expressions as
application...
+ Livestatus:
+ * 2743 FIX: Fixed handling of column types in "GET columns"...
+
HW/SW-Inventory:
* 2436 NetApp monitoring: Now able to gather data for inventory...
* 2440 VMware ESX inventory: Now able to display ESX hostsystems and virtualmachines
of clusters
diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc
index 447565f..f734314 100644
--- a/livestatus/src/TableColumns.cc
+++ b/livestatus/src/TableColumns.cc
@@ -62,7 +62,7 @@ void TableColumns::answerQuery(Query *query)
const char *TableColumns::getValue(Column *column, int colcol)
{
- static const char *typenames[6] = { "int", "float",
"string", "list", "time", "dict" };
+ static const char *typenames[8] = { "int", "float",
"string", "list", "time", "dict",
"blob", "null" };
switch (colcol)
{