[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-976-g3358e6904

[paul at claws-mail.org]

The branch, gtk3 has been updated
       via  3358e6904f15288568257e60c738f1103a54dcc2 (commit)
      from  9b7bfcddc83d6585d2ba9a64ed74ba0f31f05296 (commit)

Summary of changes:
 AUTHORS              | 4 +++-
 src/common/session.c | 7 +++++++
 src/gtk/authors.h    | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 3358e6904f15288568257e60c738f1103a54dcc2
Author: Paul <paul at claws-mail.org>
Date:   Mon Jul 13 10:39:19 2020 +0100

    fix STARTTLS protocol violation
    
    with thanks to, and patch by Damian Poddebniak and Hanno Böck

diff --git a/AUTHORS b/AUTHORS
index e31857859..4cad95a62 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -310,7 +310,7 @@ contributors (in addition to the above; based on Changelog)
 	Arthur Huillet
 	Blatinox
 	Andy Balaam
-	Hanno Boeck
+	Hanno Böck
 	Ben Hutchings
 	Ralf Bormann
 	Darac Marjal
@@ -332,3 +332,5 @@ contributors (in addition to the above; based on Changelog)
 	Jakub Kiciński
 	Jean Delvare
 	Raphael Michel
+	Damian Poddebniak
+
diff --git a/src/common/session.c b/src/common/session.c
index 7ef085d1f..2ed62e17f 100644
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -418,6 +418,13 @@ gint session_start_tls(Session *session)
 		return -1;
 	}
 
+	if (0 < session->read_buf_len) {
+		g_warning("protocol violation: suffix data after STARTTLS detected.");
+		if (nb_mode)
+			sock_set_nonblocking_mode(session->sock, session->nonblocking);
+		return -1;
+	}
+
 	if (nb_mode)
 		sock_set_nonblocking_mode(session->sock, session->nonblocking);
 
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 48c78db19..ae782c404 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -100,7 +100,7 @@ static char *CONTRIBS_LIST[] = {
 "Laurent Bigonville",
 "Jean-Luc Biord",
 "Blatinox",
-"Hanno Boeck",
+"Hanno Böck",
 "Pavlo Bohmat",
 "Ralf Bormann",
 "H. Merijn Brand",
@@ -254,6 +254,7 @@ static char *CONTRIBS_LIST[] = {
 "Thomas Orgis",
 "Reza Pakdel",
 "Richard Palo",
+"Damian Poddebniak",
 "Marcel Pol",
 "Martin Pool",
 "Quar",

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


hooks/post-receive
-- 
Claws Mail