From 267acf644c28e366b58de1d87596168db4bd145c Mon Sep 17 00:00:00 2001 From: Alexander Zaft Date: Wed, 19 Jul 2023 15:35:02 +0200 Subject: [PATCH] core: do not call register_module on error Dispatcher.get_module_instance returns None on failure. If that is the case, the dispatcher should not try to register the None value as a module. Change-Id: Ie33b8debc2a829d480d56cafc1eb0ab610181d67 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31713 Reviewed-by: Enrico Faulhaber Reviewed-by: Alexander Zaft Tested-by: Jenkins Automated Tests --- frappy/protocol/dispatcher.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappy/protocol/dispatcher.py b/frappy/protocol/dispatcher.py index 37a4927..cc76225 100644 --- a/frappy/protocol/dispatcher.py +++ b/frappy/protocol/dispatcher.py @@ -239,8 +239,9 @@ class Dispatcher: self.traceback_counter += 1 self.errors.append(f'error creating {modulename}') modobj = None - self.register_module(modobj, modulename, modobj.export) - self.srv.modules[modulename] = modobj # IS HERE THE CORRECT PLACE? + if modobj: + self.register_module(modobj, modulename, modobj.export) + self.srv.modules[modulename] = modobj # IS HERE THE CORRECT PLACE? return modobj def remove_module(self, modulename_or_obj):