From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Thu, 31 Mar 2022 10:26:06 +0000 (+0100)
Subject: [Minor] Oops, fix null check logic
X-Git-Tag: 3.3~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16ba8b55887ab1524ca8d9095f6a14726c91ed72;p=thirdparty%2Frspamd.git

[Minor] Oops, fix null check logic
---

diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
index 937a6af895..aad1a49fd1 100644
--- a/src/rspamd_proxy.c
+++ b/src/rspamd_proxy.c
@@ -328,18 +328,18 @@ rspamd_proxy_parse_upstream (rspamd_mempool_t *pool,
 	L = ctx->lua_state;
 
 	if (ucl_object_type (obj) != UCL_OBJECT) {
+		if (ucl_object_type (obj) != UCL_NULL) {
+			msg_info_pool_check("upstream %s is disabled by setting it to NULL",
+					ucl_object_key (obj));
+			return TRUE;
+		}
+
 		g_set_error (err, rspamd_proxy_quark (), 100,
 				"upstream option must be an object");
 
 		return FALSE;
 	}
 
-	if (ucl_object_type (obj) != UCL_NULL) {
-		msg_info_pool_check("upstream %s is disabled by setting it to NULL",
-				ucl_object_key (obj));
-		return TRUE;
-	}
-
 	if (!rspamd_config_is_enabled_from_ucl (pool, obj)) {
 		/* Upstream is valid but disabled */
 		msg_info_pool_check("upstream %s is disabled",
@@ -505,13 +505,13 @@ rspamd_proxy_parse_mirror (rspamd_mempool_t *pool,
 	ctx = pd->user_struct;
 	L = ctx->lua_state;
 
-	if (ucl_object_type (obj) != UCL_NULL) {
-		msg_info_pool_check("mirror %s is disabled by setting it to NULL",
-				ucl_object_key (obj));
-		return TRUE;
-	}
-
 	if (ucl_object_type (obj) != UCL_OBJECT) {
+		if (ucl_object_type (obj) != UCL_NULL) {
+			msg_info_pool_check("mirror %s is disabled by setting it to NULL",
+					ucl_object_key (obj));
+			return TRUE;
+		}
+
 		g_set_error (err, rspamd_proxy_quark (), 100,
 				"mirror option must be an object");