talons

commit edb27a1a701506fab0d12bce823f59bf302e4f00
parent b29a924ece7da846e2871bea8bbddde98edcb5cf
Author: Paul <paul@claws-mail.org>
Date:   Fri, 12 Sep 2014 07:12:44 +0100

fix bug 3265, 'procmime.c: unbalanced flockfile() / funlockfile()'

Patch by Timo Teräs

Diffstat:
M
AUTHORS
 | 
1
+
M
src/gtk/authors.h
 | 
1
+
M
src/procmime.c
 | 
3
+++

3 files changed, 5 insertions(+), 0 deletions(-)
diff --git 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
@@ -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
@@ -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;