From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 22 Nov 2023 08:41:29 +0000 (+0200)
Subject: lib-settings: settings_*get*() - Add data stack frame
X-Git-Tag: 2.4.0~1952
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35ed33f377bcb7a9e7fabe5f2894ca97a1e64dbe;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings: settings_*get*() - Add data stack frame
---

diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c
index c6dbae956c..e550b4bb60 100644
--- a/src/lib-settings/settings.c
+++ b/src/lib-settings/settings.c
@@ -1108,18 +1108,22 @@ settings_get_full(struct event *event,
 	if (instance == NULL)
 		instance = &empty_instance;
 
-	const char *filter_name;
-	if (filter_value != NULL) {
-		filter_name = t_strdup_printf("%s/%s", filter_key,
-			settings_section_escape(filter_value));
-	} else if (filter_key != NULL)
-		filter_name = filter_key;
-	else
-		filter_name = NULL;
+	int ret;
+	T_BEGIN {
+		const char *filter_name;
+		if (filter_value != NULL) {
+			filter_name = t_strdup_printf("%s/%s", filter_key,
+				settings_section_escape(filter_value));
+		} else if (filter_key != NULL)
+			filter_name = filter_key;
+		else
+			filter_name = NULL;
 
-	return settings_instance_get(event, root, instance,
-		filter_key, filter_value, filter_name, info, flags,
-		source_filename, source_linenum, set_r, error_r);
+		ret = settings_instance_get(event, root, instance,
+			filter_key, filter_value, filter_name, info, flags,
+			source_filename, source_linenum, set_r, error_r);
+	} T_END_PASS_STR_IF(ret <= 0, error_r);
+	return ret;
 }
 
 #undef settings_get