strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use comphelper::ScopeGuard to reliably uninitialize COM here

Browse source 
Change-Id: I60ccdf51731352b1749109a40c7ad61220a67d84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96135
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2020-06-11 15:31:17 +02:00
parent eaf30f9859
commit 5ea87cda46
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dbaccess/source/ui/dlg/adodatalinks.cxx
View file

@ -24,6 +24,7 @@
#undef WB_RIGHT
#include <msdasc.h>
#include <comphelper/scopeguard.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include <initguid.h>
@ -43,11 +44,13 @@ OUString PromptNew(long hWnd)
// Initialize COM
hr = ::CoInitializeEx( nullptr, COINIT_APARTMENTTHREADED );
bool bDoUninit = true;
if (FAILED(hr) && hr != RPC_E_CHANGED_MODE)
std::abort();
if (hr == RPC_E_CHANGED_MODE)
bDoUninit = false;
const bool bDoUninit = SUCCEEDED(hr);
comphelper::ScopeGuard g([bDoUninit] () {
if (bDoUninit)
CoUninitialize();
});
// Instantiate DataLinks object.
hr = CoCreateInstance(
@ -88,8 +91,6 @@ OUString PromptNew(long hWnd)
piTmpConnection->Release( );
dlPrompt->Release( );
if (bDoUninit)
CoUninitialize();
// Don't we need SysFreeString(_result)?
return o3tl::toU(_result);
}