From da49ac5b1e1e11878c3fdf9c58c1d24a0354f158 Mon Sep 17 00:00:00 2001 From: ashiire <31418397+ashiire@users.noreply.github.com> Date: Wed, 11 Jan 2023 12:20:51 +0100 Subject: [PATCH 1/2] improve named part/attachment detection will now detect filenames for parts if the part specifies Content-Disposition without a filename parameter and Content-Type with a name parameter --- mshow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mshow.c b/mshow.c index 1cd2cbc..b4463e9 100644 --- a/mshow.c +++ b/mshow.c @@ -158,11 +158,11 @@ mime_filename(struct message *msg) static char buf[512]; char *v; char *filename = 0; - - if ((v = blaze822_hdr(msg, "content-disposition"))) { - if (blaze822_mime2231_parameter(v, "filename", - buf, sizeof buf, "UTF-8")) - filename = buf; + + if ((v = blaze822_hdr(msg, "content-disposition")) && + blaze822_mime2231_parameter(v, "filename", + buf, sizeof buf, "UTF-8")) { + filename = buf; } else if ((v = blaze822_hdr(msg, "content-type"))) { if (blaze822_mime2231_parameter(v, "name", buf, sizeof buf, "UTF-8")) From 52dbd42252147a1b2c9d6e58d04be2ea0c6aea1a Mon Sep 17 00:00:00 2001 From: ashiire <31418397+ashiire@users.noreply.github.com> Date: Wed, 11 Jan 2023 12:20:51 +0100 Subject: [PATCH 2/2] improve named part/attachment detection will now detect filenames for parts if the part specifies Content-Disposition without a filename parameter and Content-Type with a name parameter --- mshow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mshow.c b/mshow.c index b4463e9..d0871f2 100644 --- a/mshow.c +++ b/mshow.c @@ -158,7 +158,7 @@ mime_filename(struct message *msg) static char buf[512]; char *v; char *filename = 0; - + if ((v = blaze822_hdr(msg, "content-disposition")) && blaze822_mime2231_parameter(v, "filename", buf, sizeof buf, "UTF-8")) {