[git] GpgOL - branch, master, updated. gpgol-2.0.6-92-g3917638

[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  39176388f3a1f55cfb05ae24e06851925c1d0032 (commit)
       via  35e706fe06e9d0b8148f372fa353c64ddfcf0525 (commit)
       via  95ae9cb976a35cfc6f43aaacb01054b132c8eb40 (commit)
      from  4662ad2828cbba6f3b4c0825439ebaa3db83f6c9 (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 39176388f3a1f55cfb05ae24e06851925c1d0032
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Mar 14 15:24:45 2018 +0100

    Disable async crypto for now
    
    * src/mail.cpp (Mail::is_inline_response): Treat every mail
    as inline response exept when DO_ASYNC_CRYPTO is defined.
    
    --
    So sad :'-(
    I really hope I find a way in the future to make it work.
    
    GnuPG-Bug-Id: T3838

diff --git a/src/mail.cpp b/src/mail.cpp
index d8a160d..b3c375c 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -2538,6 +2538,10 @@ Mail::set_window_enabled (bool value)
 bool
 Mail::check_inline_response ()
 {
+/* Async sending might lead to crashes when the send invocation is done.
+ * For now we treat every mail as an inline response to disable async
+ * encryption. :-( For more details see: T3838 */
+#ifdef DO_ASYNC_CRYPTO
   m_is_inline_response = false;
   LPDISPATCH app = GpgolAddin::get_instance ()->get_application ();
   if (!app)
@@ -2577,6 +2581,9 @@ Mail::check_inline_response ()
       m_is_inline_response = true;
     }
   xfree (inlineSubject);
+#else
+  m_is_inline_response = true;
+#endif
 
   return m_is_inline_response;
 }

commit 35e706fe06e9d0b8148f372fa353c64ddfcf0525
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Mar 14 14:11:18 2018 +0100

    Remove error handling for failure to resolve
    
    * src/cryptcontroller.cpp (CryptController::do_crypto):
    Remove an error handling.
    
    --
    This should never happen except when a bug occurs. And
    handling it here would result in the overlay not beeing
    properly destroyed.

diff --git a/src/cryptcontroller.cpp b/src/cryptcontroller.cpp
index da60c3b..dc07146 100644
--- a/src/cryptcontroller.cpp
+++ b/src/cryptcontroller.cpp
@@ -514,11 +514,7 @@ CryptController::do_crypto ()
       //error
       log_debug ("%s:%s: Failure to resolve keys.",
                  SRCNAME, __func__);
-      gpgol_message_box (nullptr,
-                         utf8_gettext ("Failure to resolve keys."),
-                         utf8_gettext ("GpgOL"), MB_OK);
-      // Error handled, return as canceled.
-      return -2;
+      return -1;
     }
   if (ret == -2)
     {

commit 95ae9cb976a35cfc6f43aaacb01054b132c8eb40
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Mar 14 14:09:34 2018 +0100

    Add small safety check in ribbon callback
    
    * src/ribbon-callbacks.cpp (get_is_details_enabled): Add
    safety check.
    
    --
    I doubt that it is necessary but I've seen logs where this
    function is the last before a crash. So just be sure.

diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 4f7d0a9..07b5ba7 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -1605,6 +1605,12 @@ HRESULT get_is_details_enabled (LPDISPATCH ctrl, VARIANT *result)
 {
   MY_MAIL_GETTER
 
+  if (!result)
+    {
+      TRACEPOINT;
+      return S_OK;
+    }
+
   result->vt = VT_BOOL | VT_BYREF;
   result->pboolVal = (VARIANT_BOOL*) xmalloc (sizeof (VARIANT_BOOL));
   *(result->pboolVal) = none_selected ? VARIANT_FALSE : VARIANT_TRUE;

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

Summary of changes:
 src/cryptcontroller.cpp  | 6 +-----
 src/mail.cpp             | 7 +++++++
 src/ribbon-callbacks.cpp | 6 ++++++
 3 files changed, 14 insertions(+), 5 deletions(-)


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