upstream/548577-gpgme-1.2.patch: do not fail to open pgp signed message with libgpgme...

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

diff --git a/edit.c b/edit.c
index d952e9a25ec4e7f5915ac44494fed689a114f408..4d74912d6a4d9bbb70972894260d61f8e47ccb2b 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -109,7 +109,7 @@ be_snarf_file (const char *path, char **buf, int *max, int *len, int verbose)
       snprintf(tmp, sizeof(tmp), "\"%s\" %lu bytes\n", path, (unsigned long) sb.st_size);
       addstr(tmp);
     }
       snprintf(tmp, sizeof(tmp), "\"%s\" %lu bytes\n", path, (unsigned long) sb.st_size);
       addstr(tmp);
     }

-    fclose (f);
+    safe_fclose (&f);

   }
   else
   {
   }
   else
   {


@@ -153,8 +153,7 @@ be_include_messages (char *msg, char **buf, int *bufmax, int *buflen,
 
   while ((msg = strtok (msg, " ,")) != NULL)
   {
 
   while ((msg = strtok (msg, " ,")) != NULL)
   {

-    n = atoi (msg);
-    if (n > 0 && n <= Context->msgcount)
+    if (mutt_atoi (msg, &n) == 0 && n > 0 && n <= Context->msgcount)

     {
       n--;
 
     {
       n--;