Crash in Registry.cpp - "Run-Time Check Failure #2 - Stack around the variable 'lpstrData' was corrupted."

I've built the agent on Windows 7 and encounter a crash in CRegistry::GetRegistryApplicationsNT
Look at the code:-

        DWORD dwSize = 256;
     TCHAR lpstrData[256];
     DWORD dwResult;

     dwResult = VerLanguageName( dwLanguage, lpstrData, dwSize);
     if ((dwResult != 0) && (dwResult < dwSize - 1))
     {
      lpstrData[dwSize]=0;
      csLanguage = lpstrData;
     }
There's also the same code in CRegistry::GetRegistryApplications9X()

The line "lpstrData[dwSize]=0" look suspicious. So I change it to "lpstrData[dwResult]=0" and the problem is fixed.

Actually, I think the line can be removed altogether because VerLanguageName() already null-terminated the result. I've tried so and it is OK. It've attached the patch to show my idea.