[git] GpgOL - branch, master, updated. gpgol-2.3.0-49-g38f9d07
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Sep 25 11:29:48 CEST 2018
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 38f9d070bf8e32cff85c85657e9c0c86fbb66e85 (commit)
via 38584f4c288307fee7b97875fbc9ce1ec72708b8 (commit)
via 7b8bfd88f2f333775c22838b90fa76809ad1372b (commit)
from b1199e9388f57044b60b1697e57ca3e267dd90c8 (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 38f9d070bf8e32cff85c85657e9c0c86fbb66e85
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Sep 25 11:27:12 2018 +0200
Fix mlang release after mlang error
* src/mlang-charset.cpp (ansi_charset_to_utf8): Fix release.
--
In case of errors we may not release the mlang charset anymore
because we are now using it cached. This caused crashes and
probably hangs.
It is a regression from:
59e8a7ee3bcd16275091c9535626e49fc2a6c4af
GnuPG-Bug-Id: T4141
diff --git a/src/mlang-charset.cpp b/src/mlang-charset.cpp
index 0529856..1e9eea1 100644
--- a/src/mlang-charset.cpp
+++ b/src/mlang-charset.cpp
@@ -81,7 +81,6 @@ char *ansi_charset_to_utf8 (const char *charset, const char *input,
{
log_error ("%s:%s: Inlen too long. Bug.",
SRCNAME, __func__);
- gpgol_release (multilang);
return NULL;
}
@@ -98,7 +97,6 @@ char *ansi_charset_to_utf8 (const char *charset, const char *input,
{
log_error ("%s:%s: Failed to find charset for: %s",
SRCNAME, __func__, charset);
- gpgol_release (multilang);
return xstrdup (input);
}
enc = (mime_info.uiInternetEncoding == 0) ? mime_info.uiCodePage :
@@ -116,7 +114,6 @@ char *ansi_charset_to_utf8 (const char *charset, const char *input,
{
log_error ("%s:%s: Failed conversion.",
SRCNAME, __func__);
- gpgol_release (multilang);
return NULL;
}
buf = (wchar_t*) xmalloc(sizeof(wchar_t) * (wlen + 1));
commit 38584f4c288307fee7b97875fbc9ce1ec72708b8
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Sep 25 09:50:32 2018 +0200
Fix a tracing regression
* src/mapihelp.cpp (mapi_set_attach_hidden): Fix return scope.
--
My regexp did not match lines that did not contain an
if or an else *sigh* above the return.
diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index 43d701b..f259b98 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -2792,7 +2792,9 @@ mapi_set_attach_hidden (LPATTACH attach)
if (SUCCEEDED (hr)
&& PROP_TYPE (propval->ulPropTag) == PT_BOOLEAN
&& propval->Value.b)
- TRETURN 0;/* Already set to hidden. */
+ {
+ TRETURN 0;/* Already set to hidden. */
+ }
prop.ulPropTag = PR_ATTACHMENT_HIDDEN;
prop.Value.b = TRUE;
commit 7b8bfd88f2f333775c22838b90fa76809ad1372b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Sep 25 09:31:36 2018 +0200
Reduce tracing verbosity a bit
--
This removes tracing from very often called functions
like message_cb in mimedataprovider or lookup_oom_dispid.
diff --git a/src/debug.cpp b/src/debug.cpp
index 454de19..13a33bb 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -347,6 +347,5 @@ const char *anonstr (const char *data)
gpgrt_lock_unlock (&anon_str_lock);
- TRACEPOINT;
return it->second.c_str();
}
diff --git a/src/mimedataprovider.cpp b/src/mimedataprovider.cpp
index 9f57f17..cf66ddf 100644
--- a/src/mimedataprovider.cpp
+++ b/src/mimedataprovider.cpp
@@ -425,7 +425,6 @@ static int
message_cb (void *opaque, rfc822parse_event_t event,
rfc822parse_t msg)
{
- TSTART;
int retval = 0;
MimeDataProvider *provider = static_cast<MimeDataProvider*> (opaque);
@@ -490,7 +489,7 @@ message_cb (void *opaque, rfc822parse_event_t event,
break;
}
- TRETURN retval;
+ return retval;
}
MimeDataProvider::MimeDataProvider(bool no_headers) :
@@ -566,8 +565,7 @@ MimeDataProvider::~MimeDataProvider()
bool
MimeDataProvider::isSupported(GpgME::DataProvider::Operation op) const
{
- TSTART;
- TRETURN op == GpgME::DataProvider::Read ||
+ return op == GpgME::DataProvider::Read ||
op == GpgME::DataProvider::Seek ||
op == GpgME::DataProvider::Write ||
op == GpgME::DataProvider::Release;
@@ -1010,8 +1008,7 @@ ssize_t MimeDataProvider::write(const void *buffer, size_t bufSize)
off_t
MimeDataProvider::seek(off_t offset, int whence)
{
- TSTART;
- TRETURN m_crypto_data.seek (offset, whence);
+ return m_crypto_data.seek (offset, whence);
}
GpgME::Data *
diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 851b7ba..383960c 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -37,13 +37,12 @@
HRESULT
gpgol_queryInterface (LPUNKNOWN pObj, REFIID riid, LPVOID FAR *ppvObj)
{
- TSTART;
HRESULT ret = pObj->QueryInterface (riid, ppvObj);
if ((opt.enable_debug & DBG_OOM_EXTRA) && *ppvObj)
{
memdbg_addRef (*ppvObj);
}
- TRETURN ret;
+ return ret;
}
HRESULT
@@ -51,7 +50,6 @@ gpgol_openProperty (LPMAPIPROP obj, ULONG ulPropTag, LPCIID lpiid,
ULONG ulInterfaceOptions, ULONG ulFlags,
LPUNKNOWN FAR * lppUnk)
{
- TSTART;
HRESULT ret = obj->OpenProperty (ulPropTag, lpiid,
ulInterfaceOptions, ulFlags,
lppUnk);
@@ -61,7 +59,7 @@ gpgol_openProperty (LPMAPIPROP obj, ULONG ulPropTag, LPCIID lpiid,
log_debug ("%s:%s: OpenProperty on %p prop %lx result %p",
SRCNAME, __func__, obj, ulPropTag, *lppUnk);
}
- TRETURN ret;
+ return ret;
}
/* Return a malloced string with the utf-8 encoded name of the object
or NULL if not available. */
@@ -117,7 +115,6 @@ get_object_name (LPUNKNOWN obj)
DISPID
lookup_oom_dispid (LPDISPATCH pDisp, const char *name)
{
- TSTART;
HRESULT hr;
DISPID dispid;
wchar_t *wname;
@@ -142,13 +139,12 @@ lookup_oom_dispid (LPDISPATCH pDisp, const char *name)
if (hr != S_OK)
dispid = DISPID_UNKNOWN;
- TRETURN dispid;
+ return dispid;
}
static void
init_excepinfo (EXCEPINFO *err)
{
- TSTART;
if (!err)
{
TRETURN;
diff --git a/src/windowmessages.cpp b/src/windowmessages.cpp
index d20655b..0b233e9 100644
--- a/src/windowmessages.cpp
+++ b/src/windowmessages.cpp
@@ -39,7 +39,6 @@ static int invalidation_blocked = 0;
LONG_PTR WINAPI
gpgol_window_proc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
- TSTART;
// log_debug ("WMG: %x", (unsigned int) message);
if (message == WM_USER + 42)
{
-----------------------------------------------------------------------
Summary of changes:
src/debug.cpp | 1 -
src/mapihelp.cpp | 4 +++-
src/mimedataprovider.cpp | 9 +++------
src/mlang-charset.cpp | 3 ---
src/oomhelp.cpp | 10 +++-------
src/windowmessages.cpp | 1 -
6 files changed, 9 insertions(+), 19 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list