From: Ricardo Mones <ricardo@mones.org>
Date: Wed, 25 Jul 2018 17:34:03 +0000 (+0200)
Subject: Mailmbox: fix buffer size
X-Git-Tag: 3.17.0~25
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e025cbc3bde755867af6011a6558126a4fb183e0

Mailmbox: fix buffer size

Should fix the following warnings reported on ML¹:

mailmbox.c: In function ‘claws_mailmbox_expunge_no_lock.part.4’:
mailmbox.c:1260:34: warning: ‘XXXXXX’ directive output may be truncated
writing 6 bytes into a region of size between 1 and 4096
[-Wformat-truncation=]
   snprintf(tmpfile, PATH_MAX, "%sXXXXXX", folder->mb_filename);
                                  ^~~~~~
mailmbox.c:1260:3: note: ‘snprintf’ output between 7 and 4102 bytes into
a destination of size 4096
   snprintf(tmpfile, PATH_MAX, "%sXXXXXX", folder->mb_filename);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

¹ https://lists.claws-mail.org/pipermail/users/2018-July/022270.html
---

diff --git a/src/plugins/mailmbox/mailmbox.c b/src/plugins/mailmbox/mailmbox.c
index 3df534271..feb2453ae 100644
--- a/src/plugins/mailmbox/mailmbox.c
+++ b/src/plugins/mailmbox/mailmbox.c
@@ -1242,7 +1242,7 @@ static int claws_mailmbox_expunge_to_file_no_lock(char * dest_filename, int dest
 
 int claws_mailmbox_expunge_no_lock(struct claws_mailmbox_folder * folder)
 {
-  char tmpfile[PATH_MAX];
+  char tmpfile[PATH_MAX + 8]; /* for the extra Xs */
   int r;
   int res;
   int dest_fd;