ntdll: Fix crash when calling RtlGetVersion prior to version_init.

Chris Wulff crwulff at rochester.rr.com
Tue Dec 18 20:51:49 CST 2007


Fix crash when calling RtlGetVersion prior to version_init. This seems
to get called several times prior to being initialized when I build on
my system (Ubuntu 7.10 - 64 bit.)

  -- Chris Wulff
-------------- next part --------------
commit 51c5c1ad30deff39eba2c7c4b64e451db3137ab2
Author: crwulff <crwulff at cybertron.(none)>
Date:   Sun Dec 2 00:17:59 2007 -0500

    Fix crash when calling RtlGetVersion prior to version_init.

diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 0f18833..ce52b07 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -527,6 +527,12 @@ done:
  */
 NTSTATUS WINAPI RtlGetVersion( RTL_OSVERSIONINFOEXW *info )
 {
+    TRACE("info = %p, current_version = %p\n", info, current_version);
+    if ((NULL == info) || (NULL == current_version))
+    {
+	    return STATUS_INVALID_PARAMETER;
+    }
+
     info->dwMajorVersion = current_version->dwMajorVersion;
     info->dwMinorVersion = current_version->dwMinorVersion;
     info->dwBuildNumber  = current_version->dwBuildNumber;


More information about the wine-patches mailing list