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

Patch by Timo Teräs

diff --git a/AUTHORS b/AUTHORS
index 52adcdcb6248fae65363b688e9a7046e31197854..e6719686212aca2254914826eaf096457ac65376 100644 (file)
--- 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 7e6af84c15f99ba51f30c5ea1d69d410be049c58..6eefc5af914b89c0569ff3db776baef4d92d9289 100644 (file)
--- 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 2275c8991031eae2a05e3083498795f42da42b5d..592f2d6ae0243e3427a8fbbe645a419a5900e054 100644 (file)
--- 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;