This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, master has been updated
via ef038f2d1db15ef14c238137c1c42a99bbe25f42 (commit)
from 92672a4b10b1ebe7188caefc78bc6025bee8114d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ef038f2d1db15ef14c238137c1c42a99bbe25f42
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Aug 25 10:22:08 2017 +0200
Fix handling of inline PGP Mails with attachment
* src/mapihelp.cpp (mapi_mark_or_create_moss_attach): Repeat check
after attachment creation.
--
The created MOSS attachment does not neccessary has position 1
it might change depending on the attachment count so the wrong
attachment may be picked up. Repeat the check for our newly
created attachment in that case.
GnuPG-Bug-Id: T3365
diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index 5c29b6c..02a6556 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -3657,7 +3657,12 @@ mapi_mark_or_create_moss_attach (LPMESSAGE message, msgtype_t msgtype)
SRCNAME, __func__);
return 0;
}
- return 1;
+ log_debug ("%s:%s: Created body attachment. Repeating lookup.",
+ SRCNAME, __func__);
+ /* The position of the MOSS attach might change depending on
+ the attachment count of the mail. So repeat the check to get
+ the right position. */
+ return mapi_mark_or_create_moss_attach (message, msgtype);
}
if (!table)
{
-----------------------------------------------------------------------
Summary of changes:
src/mapihelp.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org