- Create another branch for networking fixes

[reactos.git] / dll / ntdll / rtl / version.c

diff --git a/dll/ntdll/rtl/version.c b/dll/ntdll/rtl/version.c
index 6150c89..c55db1a 100644 (file)
--- a/dll/ntdll/rtl/version.c
+++ b/dll/ntdll/rtl/version.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/ntdll/rtl/process.c
@@ -105,6 +104,8 @@ RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build)
 NTSTATUS NTAPI
 RtlGetVersion(RTL_OSVERSIONINFOW *Info)
 {
+   LONG i, MaxLength;
+
    if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) ||
        Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW))
    {
@@ -114,17 +115,19 @@ RtlGetVersion(RTL_OSVERSIONINFOW *Info)
       Info->dwMinorVersion = Peb->OSMinorVersion;
       Info->dwBuildNumber = Peb->OSBuildNumber;
       Info->dwPlatformId = Peb->OSPlatformId;
+      RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion));
       if(((Peb->OSCSDVersion >> 8) & 0xFF) != 0)
       {
-        int i = _snwprintf(Info->szCSDVersion,
-                           (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1,
-                           L"Service Pack %d",
-                           ((Peb->OSCSDVersion >> 8) & 0xFF));
-        Info->szCSDVersion[i] = L'\0';
-      }
-      else
-      {
-        RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion));
+        MaxLength = (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1;
+        i = _snwprintf(Info->szCSDVersion,
+                       MaxLength,
+                       L"Service Pack %d",
+                       ((Peb->OSCSDVersion >> 8) & 0xFF));
+        if (i < 0)
+        {
+           /* null-terminate if it was overflowed */
+           Info->szCSDVersion[MaxLength] = L'\0';
+        }
       }
       if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW))
       {