Introduce sal::systools::CoTaskMemAllocated to use RAII for CoTaskMemFree

Change-Id: I5553138bfc8dd989e68b8bcc2be981746e8c1e84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150783
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/vcl/win/app/fileregistration.cxx b/vcl/win/app/fileregistration.cxx
index bd31c4acd607..ec7ccbcee2aa 100644
--- a/vcl/win/app/fileregistration.cxx
+++ b/vcl/win/app/fileregistration.cxx
@@ -61,21 +61,17 @@ IsPathDefaultForClass(sal::systools::COMReference<IApplicationAssociationRegistr
                       LPCWSTR aClassName, LPCWSTR progID)
 {
     // Make sure the Prog ID matches what we have
-    LPWSTR registeredApp;
+    sal::systools::CoTaskMemAllocated<wchar_t> registeredApp;
     HRESULT hr
         = pAAR->QueryCurrentDefault(aClassName, AT_FILEEXTENSION, AL_EFFECTIVE, &registeredApp);
-    if (FAILED(hr))
+    if (SUCCEEDED(hr))
     {
-        return hr;
+        if (wcsnicmp(registeredApp, progID, wcslen(progID)) == 0)
+            hr = S_OK;
+        else
+            hr = S_FALSE;
     }
 
-    if (!wcsnicmp(registeredApp, progID, wcslen(progID)))
-        hr = S_OK;
-    else
-        hr = S_FALSE;
-
-    CoTaskMemFree(registeredApp);
-
     return hr;
 }