[CA-119964] Trap exceptions and recover gracefully

Signed-off-by: Ben Chalmers <Ben.Chalmers@citrix.com>

diff --git a/src/win32stubagent/XService.cpp b/src/win32stubagent/XService.cpp
index 646563d822e93ac7d0141273e1433c27e9cb5ccd..a41850aaa1ac219ff1a671b9431ad3043583e473 100644 (file)
--- a/src/win32stubagent/XService.cpp
+++ b/src/win32stubagent/XService.cpp
@@ -780,6 +780,13 @@ void WINAPI ServiceMain(int argc, char** argv)
         }
         __except(EXCEPTION_EXECUTE_HANDLER)
         {
+            __try {
+                XsLog("Exception hit");
+            }
+            __except(EXCEPTION_EXECUTE_HANDLER)
+            {
+            }
+            stopping = false;
         }
     } while (!stopping);