[TASKMGR] CachedGetUserFromSid(): Fix user name length on cache hit

SergeGautherie · learn-more · commit f91144364b87 · 2020-07-11T01:37:53.000+02:00
diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c
@@ -144,16 +144,16 @@ CachedGetUserFromSid(
         if (EqualSid((PSID)&pEntry->Data, pSid))
         {
             wcsncpy(pUserName, pEntry->pszName, cwcUserName);
-            *pcwcUserName = cwcUserName;
+            *pcwcUserName = wcslen(pUserName);
             return;
         }
     }
 
     /* We didn't find the SID in the list, get the name conventional */
     SidToUserName(pSid, pUserName, cwcUserName);
+    *pcwcUserName = wcslen(pUserName);
 
     /* Allocate a new entry */
-    *pcwcUserName = wcslen(pUserName);
     cwcUserName = *pcwcUserName + 1;
     cbSid = GetLengthSid(pSid);
     pEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(SIDTOUSERNAME) + cbSid + cwcUserName * sizeof(WCHAR));

Original file line number	Diff line number	Diff line change
`@@ -144,16 +144,16 @@ CachedGetUserFromSid(`
`144`	`144`	`if (EqualSid((PSID)&pEntry->Data, pSid))`
`145`	`145`	`{`
`146`	`146`	`wcsncpy(pUserName, pEntry->pszName, cwcUserName);`
`147`		`- *pcwcUserName = cwcUserName;`
	`147`	`+ *pcwcUserName = wcslen(pUserName);`
`148`	`148`	`return;`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`/* We didn't find the SID in the list, get the name conventional */`
`153`	`153`	`SidToUserName(pSid, pUserName, cwcUserName);`
	`154`	`+ *pcwcUserName = wcslen(pUserName);`
`154`	`155`
`155`	`156`	`/* Allocate a new entry */`
`156`		`- *pcwcUserName = wcslen(pUserName);`
`157`	`157`	`cwcUserName = *pcwcUserName + 1;`
`158`	`158`	`cbSid = GetLengthSid(pSid);`
`159`	`159`	`pEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(SIDTOUSERNAME) + cbSid + cwcUserName * sizeof(WCHAR));`