From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Thu, 15 Aug 2024 16:45:48 +0000 (+0100)
Subject: [Minor] Fix import again
X-Git-Tag: 3.10.0~37^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1e2c58a2e87d9261cecf3e063f57aa3455e5c21f;p=rspamd.git

[Minor] Fix import again
---

diff --git a/contrib/libucl/lua_ucl.c b/contrib/libucl/lua_ucl.c
index dde546538..c2b37b14c 100644
--- a/contrib/libucl/lua_ucl.c
+++ b/contrib/libucl/lua_ucl.c
@@ -545,27 +545,20 @@ ucl_object_lua_fromelt(lua_State *L, int idx, ucl_string_flags_t flags)
 			obj = ucl_object_typed_new(UCL_NULL);
 		}
 		else {
-			ucl_object_t *other_elt = lua_ucl_object_get(L, idx);
+			/* Assume it is a text like object */
+			struct rspamd_compat_lua_text *t = lua_touserdata(L, idx);
 
-			if (other_elt) {
-				return ucl_object_ref(other_elt);
-			}
-			else {
-				/* Assume it is a text like object */
-				struct rspamd_compat_lua_text *t = lua_touserdata(L, idx);
-
-				if (t) {
-					if (t->len > 0) {
-						obj = ucl_object_fromstring_common(t->start, t->len, 0);
-					}
-					else {
-						obj = ucl_object_fromstring_common("", 0, 0);
-					}
+			if (t) {
+				if (t->len > 0) {
+					obj = ucl_object_fromstring_common(t->start, t->len, 0);
+				}
+				else {
+					obj = ucl_object_fromstring_common("", 0, 0);
+				}
 
-					/* Binary text */
-					if (t->flags & (1u << 5u)) {
-						obj->flags |= UCL_OBJECT_BINARY;
-					}
+				/* Binary text */
+				if (t->flags & (1u << 5u)) {
+					obj->flags |= UCL_OBJECT_BINARY;
 				}
 			}
 		}
@@ -585,7 +578,22 @@ ucl_object_lua_fromelt(lua_State *L, int idx, ucl_string_flags_t flags)
 		}
 		else {
 			if (type == LUA_TTABLE) {
-				obj = ucl_object_lua_fromtable(L, idx, flags);
+				lua_rawgeti(L, idx, 0);
+
+				if (lua_type(L, -1) == LUA_TUSERDATA) {
+					/* It is a cloaked ucl object */
+					obj = lua_ucl_object_get(L, idx);
+
+					if (obj) {
+						obj = ucl_object_ref(obj);
+					}
+				}
+
+				lua_pop(L, 1);
+
+				if (obj == NULL) {
+					obj = ucl_object_lua_fromtable(L, idx, flags);
+				}
 			}
 			else if (type == LUA_TFUNCTION) {
 				fd = malloc(sizeof(*fd));