diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-05-08 11:53:50 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-05-08 11:53:50 +0300 |
| commit | 6d235c90c34d55e1b6a09676c07e412aee6a03a7 (patch) | |
| tree | 65241b79398b8d9bc748c924a2591ffeb1b7d0fe /src | |
| parent | e9615c2237ffe7368d071d93e68c8507df5ea91e (diff) | |
........S. [ZBXNEXT-6452] added check for empty serialized expression/recovery expression when updating items of removed triggers
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxdbcache/dbconfig.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c index fbe9dc97e6a..ccb6990c5d7 100644 --- a/src/libs/zbxdbcache/dbconfig.c +++ b/src/libs/zbxdbcache/dbconfig.c @@ -3726,10 +3726,14 @@ static void DCsync_triggers(zbx_dbsync_t *sync) /* force trigger list update for items used in removed trigger */ - zbx_get_serialized_expression_functionids(trigger->expression, trigger->expression_bin, - &functionids); + if (NULL != trigger->expression_bin) + { + zbx_get_serialized_expression_functionids(trigger->expression, trigger->expression_bin, + &functionids); + } - if (TRIGGER_RECOVERY_MODE_RECOVERY_EXPRESSION == trigger->recovery_mode) + if (TRIGGER_RECOVERY_MODE_RECOVERY_EXPRESSION == trigger->recovery_mode && + NULL != trigger->recovery_expression_bin) { zbx_get_serialized_expression_functionids(trigger->recovery_expression, trigger->recovery_expression_bin, &functionids); |