netapi32: Fix to prevent access beyond nul terminator.

This commit is contained in:
Andrew Talbot 2011-08-22 21:47:07 +01:00 committed by Alexandre Julliard
parent 4aca760126
commit 18549f3357
1 changed files with 10 additions and 6 deletions

View File

@ -1497,13 +1497,17 @@ void NetBTInit(void)
NetBTNameEncode */ NetBTNameEncode */
char *ptr, *lenPtr; char *ptr, *lenPtr;
for (ptr = gScopeID + 1; ptr - gScopeID < sizeof(gScopeID) && *ptr; ) for (ptr = gScopeID + 1, lenPtr = gScopeID; ptr - gScopeID < sizeof(gScopeID) && *ptr; ++ptr)
{ {
for (lenPtr = ptr - 1, *lenPtr = 0; if (*ptr == '.')
ptr - gScopeID < sizeof(gScopeID) && *ptr && *ptr != '.'; {
ptr++) lenPtr = ptr;
*lenPtr += 1; *lenPtr = 0;
ptr++; }
else
{
++*lenPtr;
}
} }
} }
if (RegQueryValueExW(hKey, CacheTimeoutW, NULL, NULL, if (RegQueryValueExW(hKey, CacheTimeoutW, NULL, NULL,