ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation).

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation).
6257da8b · Zebediah Figura · Alexandre Julliard · 93107c08 · 6257da8b
Commit 6257da8b authored Oct 26, 2020 by Zebediah Figura Committed by Alexandre Julliard Oct 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 20 deletions

system.c dlls/ntdll/unix/system.c +17 -20

No files found.
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -2333,30 +2333,27 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
            "\\SystemRoot\\system32\\drivers\\mountmgr.sys"
        };
-        if (!info) ret = STATUS_ACCESS_VIOLATION;
+        ULONG i;
-        else
+        SYSTEM_MODULE_INFORMATION *smi = info;
-        {
-            ULONG i;
-            SYSTEM_MODULE_INFORMATION *smi = info;
-            len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] );
+        len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] );
-            if (len <= size)
+        if (len <= size)
+        {
+            memset( smi, 0, len );
+            for (i = 0; i < ARRAY_SIZE(fake_modules); i++)
            {
-                memset( smi, 0, len );
+                SYSTEM_MODULE *sm = &smi->Modules[i];
-                for (i = 0; i < ARRAY_SIZE(fake_modules); i++)
+                sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i;
-                {
+                sm->ImageSize = 0x200000;
-                    SYSTEM_MODULE *sm = &smi->Modules[i];
+                sm->LoadOrderIndex = i;
-                    sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i;
+                sm->LoadCount = 1;
-                    sm->ImageSize = 0x200000;
+                strcpy( (char *)sm->Name, fake_modules[i] );
-                    sm->LoadOrderIndex = i;
+                sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1;
-                    sm->LoadCount = 1;
-                    strcpy( (char *)sm->Name, fake_modules[i] );
-                    sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1;
-                }
-                smi->ModulesCount = i;
            }
-            else ret = STATUS_INFO_LENGTH_MISMATCH;
+            smi->ModulesCount = i;
        }
+        else ret = STATUS_INFO_LENGTH_MISMATCH;
        break;
    }