Zhiyi Zhang : advapi32: Check NULL return key pointers when creating registry keys.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d2045611b655dc3763c0366d511fd383b42e0a19
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d2045611b655dc3763c0366d511fd38...

Author: Zhiyi Zhang 
Date:   Mon Mar  4 12:13:46 2024 +0800

advapi32: Check NULL return key pointers when creating registry keys.

Fix Warlords Battlecry III (433280) crashes at launch.

---

dlls/advapi32/registry.c   | 6 ++++++
 dlls/kernelbase/registry.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 85e883bdcc9..e3226c38d0a 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -70,6 +70,9 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override )
  */
 LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult )
 {
+    if (!phkResult)
+        return ERROR_INVALID_PARAMETER;
+
     return RegCreateKeyExW( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE,
                             MAXIMUM_ALLOWED, NULL, phkResult, NULL );
 }
@@ -82,6 +85,9 @@ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult )
  */
 LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult )
 {
+    if (!phkResult)
+        return ERROR_INVALID_PARAMETER;
+
     return RegCreateKeyExA( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE,
                             MAXIMUM_ALLOWED, NULL, phkResult, NULL );
 }
diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c
index dcdb1cf84eb..ee57a4acdd1 100644
--- a/dlls/kernelbase/registry.c
+++ b/dlls/kernelbase/registry.c
@@ -592,6 +592,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD
 {
     UNICODE_STRING nameW, classW;

+    if (!retkey) return ERROR_BADKEY;
     if (reserved) return ERROR_INVALID_PARAMETER;
     if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE;

@@ -633,6 +634,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD
     ANSI_STRING nameA, classA;
     NTSTATUS status;

+    if (!retkey) return ERROR_BADKEY;
     if (reserved) return ERROR_INVALID_PARAMETER;
     if (!is_version_nt())
     {