X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;fp=recvcmd.c;h=f614ec91e3c3196d5cd7e0f764f0f474138efa79;hp=a8e4b6b27dcc44461ebd2507c2283b7a8edfb33a;hb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91;hpb=b62cf5fb77a75e17b176141d232655e5bd8b7fe1;ds=sidebyside

diff --git a/recvcmd.c b/recvcmd.c
index a8e4b6b..f614ec9 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -543,21 +543,15 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
   }
 
   mutt_forward_trailer (tmpfp);
-
-  fclose (tmpfp);
-  tmpfp = NULL;
+  m_fclose(&tmpfp);
 
   /* now that we have the template, send it. */
   ci_send_message (flags, tmphdr, tmpbody, NULL, parent);
   return;
 
 bail:
-
-  if (tmpfp) {
-    fclose (tmpfp);
-    mutt_unlink (tmpbody);
-  }
-
+  m_fclose(&tmpfp);
+  mutt_unlink(tmpbody);
   header_delete(&tmphdr);
 }
 
@@ -651,7 +645,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)
         }
       }
     }
-    fclose (tmpfp);
+    m_fclose(&tmpfp);
   }
   else if (rc == M_YES) {       /* do MIME encapsulation - we don't need to do much here */
     last = &tmphdr->content;
@@ -921,12 +915,12 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
         copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
                                       0) == NULL) {
       header_delete(&tmphdr);
-      fclose (tmpfp);
+      m_fclose(&tmpfp);
       return;
     }
   }
 
-  fclose (tmpfp);
+  m_fclose(&tmpfp);
 
   if (ci_send_message (flags, tmphdr, tmpbody, NULL, parent) == 0)
     mutt_set_flag (Context, hdr, M_REPLIED, 1);