[MERGE #5919 @pleath] Handle non-null-terminated function name in ETW

pleath · pleath · commit 4e344dfd9120 · 2019-01-22T10:46:25.000-08:00
Merge pull request #5919 from pleath:etwfuncname
diff --git a/lib/Runtime/Base/EtwTrace.cpp b/lib/Runtime/Base/EtwTrace.cpp
@@ -382,7 +382,7 @@ size_t EtwTrace::GetSimpleJitFunctionName(
     const size_t suffixCharLength = _countof(_u("Simple")) - 1;
 
     const char16 *const functionName = GetFunctionName(body);
-    const size_t functionNameCharLength = wcslen(functionName);
+    const size_t functionNameCharLength = body->GetDisplayNameLength();
     const size_t requiredCharCapacity = functionNameCharLength + suffixCharLength + 1;
     if(requiredCharCapacity > nameCharCapacity || name == NULL)
     {

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ size_t EtwTrace::GetSimpleJitFunctionName(`
`382`	`382`	`const size_t suffixCharLength = _countof(_u("Simple")) - 1;`
`383`	`383`
`384`	`384`	`const char16 *const functionName = GetFunctionName(body);`
`385`		`- const size_t functionNameCharLength = wcslen(functionName);`
	`385`	`+ const size_t functionNameCharLength = body->GetDisplayNameLength();`
`386`	`386`	`const size_t requiredCharCapacity = functionNameCharLength + suffixCharLength + 1;`
`387`	`387`	`if(requiredCharCapacity > nameCharCapacity \|\| name == NULL)`
`388`	`388`	`{`