mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-27 07:34:15 +02:00
ConfigItem: Fix infinite recursion caused by ignore_on_error
when committing an item
When committing an item with `ignore_on_error` flag set fails, the `Commit()` method only returns `nullptr` and the current item is not being dropped from `m_Items`. `CommittNewItems()` also doesn't check the return value of `Commit()` but just continues and tries to commit all items from `m_Items` in recursive call. Since this corrupt item is never removed from `m_Items`, it ends up in an endless recursion till it finally crashes.
This commit is contained in:
parent
1b2875dc45
commit
2adc0bd042
@ -470,7 +470,14 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
|
|||||||
if (item->m_Type != type)
|
if (item->m_Type != type)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ip.first->Commit(ip.second);
|
if (!item->Commit(ip.second)) {
|
||||||
|
if (item->IsIgnoreOnError()) {
|
||||||
|
item->Unregister();
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
committed_items++;
|
committed_items++;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user