Fix crash that can occur when failure pointers are null (microsoft#1880)

sba923 · Jan 28, 2022 · 2491b6b · 2491b6b
1 parent 4bead76
commit 2491b6b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp b/src/AppInstallerCommonCore/AppInstallerTelemetry.cpp
@@ -219,10 +219,10 @@ namespace AppInstaller::Logging
 
             m_summary.FailureHResult = failure.hr;
             m_summary.FailureMessage = anonMessage;
-            m_summary.FailureModule = failure.pszModule;
+            m_summary.FailureModule = StringOrEmptyIfNull(failure.pszModule);
             m_summary.FailureThreadId = failure.threadId;
             m_summary.FailureType = ConvertWilFailureTypeToFailureType(failure.type);
-            m_summary.FailureFile = failure.pszFile;
+            m_summary.FailureFile = StringOrEmptyIfNull(failure.pszFile);
             m_summary.FailureLine = failure.uLineNumber;
         }
 

diff --git a/src/AppInstallerCommonCore/Public/AppInstallerStrings.h b/src/AppInstallerCommonCore/Public/AppInstallerStrings.h
@@ -177,4 +177,17 @@ namespace AppInstaller::Utility
     {
         return ConvertContainerToString(container, [](const auto& item) { return item; });
     }
+
+    template <typename CharType>
+    std::basic_string<CharType> StringOrEmptyIfNull(const CharType* string)
+    {
+        if (string)
+        {
+            return { string };
+        }
+        else
+        {
+            return {};
+        }
+    }
 }