fix potential buffer overflow

svn path=/trunk/; revision=33725
2024-07-11 07:05:12 +00:00 · 2008-05-27 08:28:52 +00:00 · 2008-05-27 08:28:52 +00:00 · d0a0a529f1
parent 6fdb1140a3
commit d0a0a529f1
1 changed files with 16 additions and 3 deletions
--- a/reactos/dll/win32/user32/misc/dllmain.c
+++ b/reactos/dll/win32/user32/misc/dllmain.c
@ -90,9 +90,22 @@ GetDllList()
                LPWSTR lpBuffer = (LPWSTR)kvpInfo->Data;
                if (lpBuffer != UNICODE_NULL)
                {
-                    RtlMoveMemory(szAppInit,
-                                  kvpInfo->Data,
-                                  min(kvpInfo->DataLength, KEY_LENGTH));
+                    INT bytesToCopy, nullPos;
+
+                    bytesToCopy = min(kvpInfo->DataLength, KEY_LENGTH * sizeof(WCHAR));
+
+                    if (bytesToCopy != 0)
+                    {
+                        RtlMoveMemory(szAppInit,
+                                      kvpInfo->Data,
+                                      bytesToCopy);
+
+                        nullPos = (bytesToCopy / sizeof(WCHAR)) - 1;
+
+                        /* ensure string is terminated */
+                        szAppInit[nullPos] = UNICODE_NULL;
+                    }
+
                    bRet = TRUE;
                }
            }