[Commits] [SCM] claws branch, master, updated. 3.18.0-13-g2e3ac1454

[jonathan at claws-mail.org]

The branch, master has been updated
       via  2e3ac1454a60c5a22a7c7786b086b148c99a42f5 (commit)
       via  8f9fe3509cda943eb8b66f79040faf1037407c44 (commit)
      from  0dc0fa955fc6d03dc19a39a7afd0c83161dd9508 (commit)

Summary of changes:
 src/common/utils.c                               | 8 ++++++++
 src/plugins/litehtml_viewer/Makefile.am          | 5 +++++
 src/plugins/litehtml_viewer/litehtml/Makefile.am | 1 +
 3 files changed, 14 insertions(+)


- Log -----------------------------------------------------------------
commit 2e3ac1454a60c5a22a7c7786b086b148c99a42f5
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date:   Sun Jul 25 23:24:10 2021 -0700

    Add preprocessor definition for WIN32

diff --git a/src/plugins/litehtml_viewer/Makefile.am b/src/plugins/litehtml_viewer/Makefile.am
index f91ea5926..643b907ea 100644
--- a/src/plugins/litehtml_viewer/Makefile.am
+++ b/src/plugins/litehtml_viewer/Makefile.am
@@ -40,10 +40,14 @@ endif
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
+def_win32 = -DWIN32
 else
 no_undefined =
+def_win32 =
 endif
 
+export def_win32
+
 if CYGWIN
 cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
 else
@@ -91,6 +95,7 @@ litehtml_viewer_la_LDFLAGS = \
 	$(LIBGUMBO_LIBS)
 
 litehtml_viewer_la_CPPFLAGS = \
+	$(def_win32) \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
diff --git a/src/plugins/litehtml_viewer/litehtml/Makefile.am b/src/plugins/litehtml_viewer/litehtml/Makefile.am
index 025e3152b..1ae5c258f 100644
--- a/src/plugins/litehtml_viewer/litehtml/Makefile.am
+++ b/src/plugins/litehtml_viewer/litehtml/Makefile.am
@@ -58,6 +58,7 @@ liblitehtml_la_LDFLAGS = \
         $(LIBGUMBO_LIBS)
 
 liblitehtml_la_CPPFLAGS = \
+        $(def_win32) \
         $(LIBGUMBO_CFLAGS)
 
 EXTRA_DIST = \

commit 8f9fe3509cda943eb8b66f79040faf1037407c44
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date:   Mon Mar 29 19:42:53 2021 -0700

    check if string is valid UTF-8 before collating

diff --git a/src/common/utils.c b/src/common/utils.c
index b8cf669ee..cd01eb530 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -452,6 +452,14 @@ gint subject_compare_for_sort(const gchar *s1, const gchar *s2)
 	trim_subject_for_sort(str1);
 	trim_subject_for_sort(str2);
 
+	if (!g_utf8_validate(str1, -1, NULL)) {
+		g_warning("message subject \"%s\" failed UTF-8 validation", str1);
+		return 0;
+	} else if (!g_utf8_validate(str2, -1, NULL)) {
+		g_warning("message subject \"%s\" failed UTF-8 validation", str2);
+		return 0;
+	}
+
 	return g_utf8_collate(str1, str2);
 }
 

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


hooks/post-receive
-- 
Claws Mail