[NFC][fuzzer] Cleanup SetThreadName after D156317

vitalybuka · vitalybuka · commit 151e33c768a6 · 2023-08-28T10:59:39.000-07:00
diff --git a/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp b/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
@@ -234,11 +234,10 @@ size_t PageSize() {
 }
 
 void SetThreadName(std::thread &thread, const std::string &name) {
-  std::wstring wname;
   auto sz = MultiByteToWideChar(CP_UTF8, 0, name.data(), name.size(), nullptr, 0);
-  wname.resize(sz);
-  if (sz == MultiByteToWideChar(CP_UTF8, 0, name.data(), name.size(), &wname[0],
-                                sz) > 0) {
+  std::wstring wname(sz, L' ');
+  if ((sz == MultiByteToWideChar(CP_UTF8, 0, name.data(), name.size(),
+                                 &wname[0], sz)) > 0) {
     wname.resize(sz - 1);
     (void)SetThreadDescription(thread.native_handle(), wname.c_str());
   }

Original file line number	Diff line number	Diff line change
`@@ -234,11 +234,10 @@ size_t PageSize() {`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`void SetThreadName(std::thread &thread, const std::string &name) {`
`237`		`- std::wstring wname;`
`238`	`237`	`auto sz = MultiByteToWideChar(CP_UTF8, 0, name.data(), name.size(), nullptr, 0);`
`239`		`- wname.resize(sz);`
`240`		`- if (sz == MultiByteToWideChar(CP_UTF8, 0, name.data(), name.size(), &wname[0],`
`241`		`- sz) > 0) {`
	`238`	`+ std::wstring wname(sz, L' ');`
	`239`	`+ if ((sz == MultiByteToWideChar(CP_UTF8, 0, name.data(), name.size(),`
	`240`	`+ &wname[0], sz)) > 0) {`
`242`	`241`	`wname.resize(sz - 1);`
`243`	`242`	`(void)SetThreadDescription(thread.native_handle(), wname.c_str());`
`244`	`243`	`}`