Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndris Zeila <andris.zeila@zabbix.com>2021-05-08 11:59:57 +0300
committerAndris Zeila <andris.zeila@zabbix.com>2021-05-08 11:59:57 +0300
commit91c90bdcc7be27df45c9ea1a198e55a14b3b55a0 (patch)
tree60b597c6bfe0e536c4fe3629c04633abf316247d /src
parent6d235c90c34d55e1b6a09676c07e412aee6a03a7 (diff)
....I..... [ZBXNEXT-6452] added check to safeguard against broken item keys when converting aggregate checks
Diffstat (limited to 'src')
-rw-r--r--src/libs/zbxdbupgrade/dbupgrade_5030.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libs/zbxdbupgrade/dbupgrade_5030.c b/src/libs/zbxdbupgrade/dbupgrade_5030.c
index cbc421eb2fa..2b4b7aff37b 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_5030.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_5030.c
@@ -6399,7 +6399,12 @@ static int DBpatch_5030169(void)
params_offset = 0;
init_request(&request);
- parse_item_key(row[1], &request);
+
+ if (SUCCEED != parse_item_key(row[1], &request))
+ {
+ zabbix_log(LOG_LEVEL_WARNING, "Cannot parse aggregate checks item key \"%s\"", row[0]);
+ continue;
+ }
ret_formula = dbpatch_aggregate2formula(row[0], &request, &params, &params_alloc, &params_offset,
&error);