[Commits] [SCM] claws branch, master, updated. 3.10.1-157-gedb27a1

[claws at claws-mail.org]

The branch, master has been updated
       via  edb27a1a701506fab0d12bce823f59bf302e4f00 (commit)
      from  b29a924ece7da846e2871bea8bbddde98edcb5cf (commit)

Summary of changes:
 AUTHORS           |    1 +
 src/gtk/authors.h |    1 +
 src/procmime.c    |    3 +++
 3 files changed, 5 insertions(+)


- Log -----------------------------------------------------------------
commit edb27a1a701506fab0d12bce823f59bf302e4f00
Author: Paul <paul at claws-mail.org>
Date:   Fri Sep 12 07:12:44 2014 +0100

    fix bug 3265, 'procmime.c: unbalanced flockfile() / funlockfile()'
    
    Patch by Timo Teräs

diff --git a/AUTHORS b/AUTHORS
index 52adcdc..e671968 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -308,3 +308,4 @@ contributors (in addition to the above; based on Changelog)
 	Igor Gnatenko
 	Kevin Day
 	Alessandro Di Federico
+	Timo Teräs
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 7e6af84..6eefc5a 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -263,6 +263,7 @@ static char *CONTRIBS_LIST[] = {
 "Takahashi",
 "Tanaka",
 "Shimamoto \"Neko\" Tatsuya",
+"Timo Teräs",
 "Pascal Terjan",
 "Thorsten Thielen",
 "Edgar Toernig",
diff --git a/src/procmime.c b/src/procmime.c
index 2275c89..592f2d6 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -372,6 +372,9 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
 		procmime_fclose(infp);
 		return FALSE;
 	}
+#ifdef HAVE_FGETS_UNLOCKED
+	flockfile(outfp);
+#endif
 	tmp_file = TRUE;
 	readend = mimeinfo->offset + mimeinfo->length;
 

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


hooks/post-receive
-- 
Claws Mail