[git] GpgOL - branch, master, updated. gpgol-2.0.6-119-gc9343fa

[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  c9343fa680d37927341292c48ef3be2001e1a6cc (commit)
       via  857afbf1a2e594b1ca10a84842d372c1edb87507 (commit)
      from  0aac05ee0cfbe8101e9df59f0cd0716fbf84c596 (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 c9343fa680d37927341292c48ef3be2001e1a6cc
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Apr 5 12:01:18 2018 +0200

    Revert "Jump the event queue"
    
    This reverts commit a6bf8ef284d98f87a9e64ce326e2a0a55633213c.
    
    --
    Did not work as intended

diff --git a/src/olflange.h b/src/olflange.h
index 31aea7a..7601eb6 100644
--- a/src/olflange.h
+++ b/src/olflange.h
@@ -37,7 +37,7 @@ DEFINE_GUID(CLSID_GPGOL, 0x42d30988, 0x1a3a, 0x11da,
  */
 
 /* The ProgID used by us */
-#define GPGOL_PROGID "Z.GNU.GpgOL"
+#define GPGOL_PROGID "GNU.GpgOL"
 /* User friendly add in name */
 #define GPGOL_PRETTY "GpgOL - The GnuPG Outlook Plugin"
 /* Short description of the addin */

commit 857afbf1a2e594b1ca10a84842d372c1edb87507
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Apr 5 11:29:02 2018 +0200

    More saveguards and logging in get_ultimate_keys
    
    * src/parsecontroller.cpp (ParseController::get_ultimate_keys):
    Add more debug output and saveguards.
    
    --
    From the logs in a bugreport it looks very much like we
    crash somewhere in between starting the keylisting and
    finishing it.
    
    Checking for invalid key or if a uid has an id makes
    sense, but might not be the crash.
    
    GnuPG-Bug-Id: T3857

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index a4debf5..454ac4c 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -475,6 +475,7 @@ ParseController::get_ultimate_keys()
     }
   ctx->setKeyListMode (KeyListMode::Local);
   Error err;
+  TRACEPOINT;
   if ((err = ctx->startKeyListing ()))
     {
       log_error ("%s:%s: Failed to start keylisting err: %i: %s",
@@ -483,23 +484,36 @@ ParseController::get_ultimate_keys()
       gpgrt_lock_unlock (&keylist_lock);
       return s_ultimate_keys;
     }
+  TRACEPOINT;
   while (!err)
     {
       const auto key = ctx->nextKey(err);
       if (err || key.isNull())
         {
+          TRACEPOINT;
           break;
         }
+      if (key.isInvalid ())
+        {
+          log_debug ("%s:%s: skipping invalid key.",
+                     SRCNAME, __func__);
+          continue;
+        }
       for (const auto uid: key.userIDs())
         {
-          if (uid.validity() == UserID::Validity::Ultimate)
+          if (uid.validity() == UserID::Validity::Ultimate &&
+              uid.id())
             {
               s_ultimate_keys.push_back (key);
-              log_debug ("adding ultimate uid: %s", uid.id());
+              log_debug ("%s:%s: Adding ultimate uid.",
+                         SRCNAME, __func__);
+              log_mime_parser ("%s:%s: Added uid %s.",
+                               SRCNAME, __func__, uid.id());
               break;
             }
         }
     }
+  TRACEPOINT;
   delete ctx;
   log_debug ("%s:%s: keylisting done.",
              SRCNAME, __func__);

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

Summary of changes:
 src/olflange.h          |  2 +-
 src/parsecontroller.cpp | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)


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