commit 508f85e: [Minor] Lua_html: Return empty table if no images are there in html

Vsevolod Stakhov vsevolod at highsecure.ru
Wed Apr 8 13:21:08 UTC 2020


Author: Vsevolod Stakhov
Date: 2020-04-08 14:11:55 +0100
URL: https://github.com/rspamd/rspamd/commit/508f85e07f5725778455e5f6c7cab6646c5ce781 (HEAD -> master)

[Minor] Lua_html: Return empty table if no images are there in html

---
 src/lua/lua_html.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/lua/lua_html.c b/src/lua/lua_html.c
index 7d7e9b7a3..1b633b03f 100644
--- a/src/lua/lua_html.c
+++ b/src/lua/lua_html.c
@@ -271,7 +271,7 @@ lua_html_push_image (lua_State *L, struct html_image *img)
 	struct lua_html_tag *ltag;
 	struct rspamd_url **purl;
 
-	lua_newtable (L);
+	lua_createtable (L, 0, 7);
 
 	if (img->src) {
 		lua_pushstring (L, "src");
@@ -334,21 +334,20 @@ lua_html_get_images (lua_State *L)
 	guint i;
 
 	if (hc != NULL) {
-		lua_newtable (L);
+		if (hc->images) {
+			lua_createtable (L, hc->images->len, 0);
 
-		if (hc->images && hc->images->len > 0) {
-			for (i = 0; i < hc->images->len; i ++) {
-				img = g_ptr_array_index (hc->images, i);
+			PTR_ARRAY_FOREACH (hc->images, i, img) {
 				lua_html_push_image (L, img);
 				lua_rawseti (L, -2, i + 1);
 			}
 		}
 		else {
-			lua_pushnil (L);
+			lua_newtable (L);
 		}
 	}
 	else {
-		lua_pushnil (L);
+		lua_newtable (L);
 	}
 
 	return 1;


More information about the Commits mailing list