Fix bug in IsWuRebootPending where it uninitialized COM on failure.

Fixes other half of 6870

1 files changed, 7 insertions, 2 deletions

diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp
index 35100336..0117a993 100644
--- a/src/burn/engine/registration.cpp
+++ b/src/burn/engine/registration.cpp
@@ -1613,12 +1613,14 @@ LExit:
 static BOOL IsWuRebootPending()
 {
     HRESULT hr = S_OK;
+    BOOL fUninitializeCom = FALSE;
     BOOL fRebootPending = FALSE;
 
     // Do a best effort to ask WU if a reboot is required. If anything goes
     // wrong then let's pretend a reboot is not required.
     hr = ::CoInitialize(NULL);
-    if (SUCCEEDED(hr) || RPC_E_CHANGED_MODE == hr)
+    fUninitializeCom = SUCCEEDED(hr);
+    if (fUninitializeCom || RPC_E_CHANGED_MODE == hr)
     {
         hr = WuaRestartRequired(&fRebootPending);
         if (FAILED(hr))
@@ -1626,7 +1628,10 @@ static BOOL IsWuRebootPending()
             fRebootPending = FALSE;
         }
 
-        ::CoUninitialize();
+        if (fUninitializeCom)
+        {
+            ::CoUninitialize();
+        }
     }
 
     return fRebootPending;