From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 28 May 2021 09:50:37 +0000 (+0100)
Subject: [Minor] Fix styles propagation
X-Git-Tag: 3.0~360
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89b98cbd7c8cdbfa923e68cbeab4001b7b3aa28c;p=thirdparty%2Frspamd.git

[Minor] Fix styles propagation
---

diff --git a/src/libserver/html/html.cxx b/src/libserver/html/html.cxx
index 15865533a3..2f124c65ff 100644
--- a/src/libserver/html/html.cxx
+++ b/src/libserver/html/html.cxx
@@ -1583,6 +1583,10 @@ html_propagate_style(struct html_content *hc,
 	struct html_block *bl_parent;
 	gboolean push_block = FALSE;
 
+	if (blocks.empty()) {
+		/* No blocks to propagate */
+		return;
+	}
 	/* Propagate from the parent if needed */
 	bl_parent = blocks.back();
 
diff --git a/src/libserver/html/html_tag.hxx b/src/libserver/html/html_tag.hxx
index 3375931d17..645c3433e3 100644
--- a/src/libserver/html/html_tag.hxx
+++ b/src/libserver/html/html_tag.hxx
@@ -42,17 +42,17 @@ enum class html_component_type : std::uint8_t {
 using html_tag_extra_t = std::variant<std::monostate, struct rspamd_url *, struct html_image *>;
 
 struct html_tag {
-	gint id;
-	gint flags;
-	guint content_length;
-	goffset content_offset;
+	gint id = -1;
+	gint flags = 0;
+	guint content_length = 0;
+	goffset content_offset = 0;
 
 	std::string_view name;
 	robin_hood::unordered_flat_map<html_component_type, std::string_view> parameters;
 
 	html_tag_extra_t extra;
-	struct html_block *block; /* TODO: temporary, must be handled by css */
-	GNode *parent;
+	struct html_block *block = nullptr; /* TODO: temporary, must be handled by css */
+	GNode *parent = nullptr;
 };
 
 }