[git] GpgOL - branch, master, updated. gpgol-2.3.2-6-g0193956

[by Andre Heinecke]

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  019395666f179b975341dfce76ae3b7a3867b2fe (commit)
       via  572420273d97b79157cc4b9be8f45e431f8df284 (commit)
      from  e8c7a5285420acd86ac97143747b78b6934151b3 (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 019395666f179b975341dfce76ae3b7a3867b2fe
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Nov 26 14:41:24 2018 +0100

    Fix two memdbg refcount errors
    
    * src/mapihelp.cpp (is_really_cms_encrypted): Fix references.
    
    --
    This code is almost never run so that did not happen before.

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index 3949ea3..acd28c8 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -856,7 +856,8 @@ is_really_cms_encrypted (LPMESSAGE message)
                  SRCNAME, __func__, hr);
       TRETURN -1;
     }
-      
+  memdbg_addRef (mapitable);
+
   hr = HrQueryAllRows (mapitable, (LPSPropTagArray)&propAttNum,
                        NULL, NULL, 0, &mapirows);
   if (FAILED (hr))
@@ -916,6 +917,7 @@ is_really_cms_encrypted (LPMESSAGE message)
       goto leave;
     }
 
+  memdbg_addRef (stream);
   hr = stream->Read (buffer, sizeof buffer, &nread);
   if ( hr != S_OK )
     {

commit 572420273d97b79157cc4b9be8f45e431f8df284
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Nov 26 14:15:45 2018 +0100

    Avoid use of error msg class "IPM.Note.GpgOL"
    
    * src/mapihelp.cpp (change_message_class_ipm_note_secure_cex),
    (change_message_class_ipm_note_smime): Use OpaqueEncrypted
    rather then IPM.Note.GpgOL.
    (mapi_change_message_class): Change old IPM.Note.GpgOL mails.
    
    --
    This should help debugging
    GnuPG-Bug-Id: T4267
    
    And in any case IPM.Note.GpgOL should never be used as
    we do not handle it in decryption.

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index 4a1d532..3949ea3 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -1248,7 +1248,7 @@ change_message_class_ipm_note_smime (LPMESSAGE message)
 
   /* If we did not found anything but let's change the class anyway.  */
   if (!newvalue && opt.enable_smime)
-    newvalue = xstrdup ("IPM.Note.GpgOL");
+    newvalue = xstrdup ("IPM.Note.GpgOL.OpaqueEncrypted");
 
   TRETURN newvalue;
 }
@@ -1412,7 +1412,7 @@ change_message_class_ipm_note_secure_cex (LPMESSAGE message, int is_cexenc)
     }
 
   if (!newvalue)
-    newvalue = xstrdup ("IPM.Note.GpgOL");
+    newvalue = xstrdup ("IPM.Note.GpgOL.OpaqueEncrypted");
 
   TRETURN newvalue;
 }
@@ -1528,7 +1528,8 @@ mapi_change_message_class (LPMESSAGE message, int sync_override,
         {
           newvalue = change_message_class_ipm_note (message);
         }
-      else if (opt.enable_smime && !strcmp (s, "IPM.Note.SMIME"))
+      else if (opt.enable_smime && (!strcmp (s, "IPM.Note.SMIME") ||
+                                    !strcmp (s, "IPM.Note.GpgOL")))
         {
           newvalue = change_message_class_ipm_note_smime (message);
         }

-----------------------------------------------------------------------

Summary of changes:
 src/mapihelp.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org