Fix crash in ConfigItem::RunWithActivationContext

fixes #11085

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index a6c959e5899ad4d162ac5688ee8baa7dc2e5d08c..8a14de5aae79084813f2a7d1d14422348725299d 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -521,8 +521,6 @@ bool ConfigItem::CommitItems(const ActivationContext::Ptr& context, WorkQueue& u
                return false;
        }
 
-       ASSERT(newItems.size() > 0);
-
        ApplyRule::CheckMatches();
 
        /* log stats for external parsers */
@@ -593,6 +591,9 @@ bool ConfigItem::RunWithActivationContext(const Function::Ptr& function)
 {
        ActivationScope scope;
 
+       if (!function)
+               BOOST_THROW_EXCEPTION(ScriptError("'function' argument must not be null."));
+
        {
                ScriptFrame frame;
                function->Invoke();