netapi32: Fix to prevent access beyond nul terminator.

18549f33 · Andrew Talbot · Alexandre Julliard · 4aca7601 · 18549f33
Commit 18549f33 authored Aug 22, 2011 by Andrew Talbot Committed by Alexandre Julliard Aug 23, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

nbt.c dlls/netapi32/nbt.c +10 -6

No files found.
--- a/dlls/netapi32/nbt.c
+++ b/dlls/netapi32/nbt.c
@@ -1497,13 +1497,17 @@ void NetBTInit(void)
               NetBTNameEncode */
            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;
-                     ptr - gScopeID < sizeof(gScopeID) && *ptr && *ptr != '.';
-                     ptr++)
-                    *lenPtr += 1;
-                ptr++;
+                if (*ptr == '.')
+                {
+                    lenPtr = ptr;
+                    *lenPtr = 0;
+                }
+                else
+                {
+                    ++*lenPtr;
+                }
            }
        }
        if (RegQueryValueExW(hKey, CacheTimeoutW, NULL, NULL,