From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 17 Apr 2023 22:53:26 +0000 (+0300)
Subject: lib-master: settings_get*() - Require event to be non-NULL
X-Git-Tag: 2.4.0~2150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fea528c96a0027bb1736da3d8071d9982f6d377;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: settings_get*() - Require event to be non-NULL
---

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 9ea308e1c7..008f70278a 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -1335,12 +1335,12 @@ int settings_get(struct event *event,
 	struct settings_instance *instance = NULL;
 	struct event *scan_event = event;
 
-	while (scan_event != NULL) {
+	do {
 		instance = event_get_ptr(scan_event, SETTINGS_EVENT_INSTANCE);
 		if (instance != NULL)
 			break;
 		scan_event = event_get_parent(scan_event);
-	}
+	} while (scan_event != NULL);
 
 	/* no instance-specific settings */
 	struct settings_instance empty_instance = {