upstream/311296-rand-mktemp.patch: more random file creation in /tmp, see CVE CAN...

[software/mutt-debian.git] / help.c

diff --git a/help.c b/help.c
index 88f465a0e16ee654443ba21098b222a1646afaa7..10ad9cf25b1ef670a6ed3a3ddb0420d3a3849f4e 100644 (file)
--- a/help.c
+++ b/help.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
+ * Copyright (C) 1996-2000,2009 Michael R. Elkins <me@mutt.org>
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -256,7 +256,7 @@ static void format_line (FILE *f, int ismacro,
        n = get_wrapped_width (t3, n);
       }
 
-      print_macro (f, n, &t3);
+      n = print_macro (f, n, &t3);
 
       if (*t3)
       {
@@ -367,7 +367,7 @@ void mutt_help (int menu)
     if (menu != MENU_PAGER)
       dump_unbound (f, OpGeneric, Keymaps[MENU_GENERIC], Keymaps[menu]);
   
-    fclose (f);
+    safe_fclose (&f);
   
     snprintf (buf, sizeof (buf), _("Help for %s"), desc);
   }