[Commits] [SCM] claws branch, master, updated. 3.18.0-27-g76dd15b02

[paul at claws-mail.org]

The branch, master has been updated
       via  76dd15b024ec646d6b091f6b874c6c2d761ac5fb (commit)
      from  dae174542ee5a97c297a0e2491d3820fa0c6ff4c (commit)

Summary of changes:
 AUTHORS                                           | 5 ++++-
 src/gtk/authors.h                                 | 1 +
 src/plugins/litehtml_viewer/litehtml/html_tag.cpp | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 76dd15b024ec646d6b091f6b874c6c2d761ac5fb
Author: paul <paul at claws-mail.org>
Date:   Tue Aug 3 12:10:01 2021 +0100

    fix bug 4312, 'litehtml plugin loops (hangup)'
    
    patch by Frank Mueller

diff --git a/AUTHORS b/AUTHORS
index 3b551265c..ed1d106c3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -330,10 +330,13 @@ contributors (in addition to the above; based on Changelog)
 	Alexander Lyons Harkness
 	Jakub Kiciński
 	Jean Delvare
+	Raphael Michel
 	Damian Poddebniak
 	Alvar Penning
         David Fletcher
 	Orivej Desh
 	Steve Randall
 	Ramin Yaghoubzadeh Torky
-
+	Manuel Stoeckl
+        David Fletcher
+	Frank Mueller
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 4ddf79509..2db1dbb34 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -226,6 +226,7 @@ static char *CONTRIBS_LIST[] = {
 "Neill Miller",
 "Suzuki Mio",
 "Alex S Moore",
+"Frank Mueller",
 "NAKAGAWA",
 "Yuuki NINOMIYA",
 "Satoshi Nagayasu",
diff --git a/src/plugins/litehtml_viewer/litehtml/html_tag.cpp b/src/plugins/litehtml_viewer/litehtml/html_tag.cpp
index a93038b53..cb046b85b 100644
--- a/src/plugins/litehtml_viewer/litehtml/html_tag.cpp
+++ b/src/plugins/litehtml_viewer/litehtml/html_tag.cpp
@@ -3920,6 +3920,9 @@ int litehtml::html_tag::render_box(int x, int y, int max_width, bool second_pass
 {
 	int parent_width = max_width;
 
+	if (max_width <= 0)
+		return 0;
+
 	calc_outlines(parent_width);
 
 	m_pos.clear();

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail