Alexandre Julliard : ntdll: Fix the return value of NtOpenKey for some invalid parameters.
Alexandre Julliard
julliard at winehq.org
Tue Feb 16 11:44:41 CST 2010
Module: wine
Branch: master
Commit: 0e98500e436852274eb600fa0c691f3ef811fec2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e98500e436852274eb600fa0c691f3ef811fec2
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 16 14:32:26 2010 +0100
ntdll: Fix the return value of NtOpenKey for some invalid parameters.
---
dlls/advapi32/registry.c | 1 +
dlls/ntdll/reg.c | 4 ++--
dlls/ntdll/tests/reg.c | 6 ++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 7faee3c..b9cb8c5 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -311,6 +311,7 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM acc
/* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */
if (hkey == HKEY_CLASSES_ROOT && name && *name == '\\') name++;
+ if (!retkey) return ERROR_INVALID_PARAMETER;
if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE;
attr.Length = sizeof(attr);
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 9b3aae5..3bee588 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -116,13 +116,13 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR
NTSTATUS ret;
DWORD len;
- if (!attr) return STATUS_ACCESS_VIOLATION;
+ if (!retkey || !attr) return STATUS_ACCESS_VIOLATION;
+ if (attr->Length > sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER;
len = attr->ObjectName->Length;
TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory,
debugstr_us(attr->ObjectName), access, retkey );
if (len > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW;
- if (!retkey) return STATUS_INVALID_PARAMETER;
SERVER_START_REQ( open_key )
{
diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index 67bd125..8a86627 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -351,14 +351,12 @@ static void test_NtOpenKey(void)
/* NULL key */
status = pNtOpenKey(NULL, am, &attr);
- todo_wine
- ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status);
/* Length > sizeof(OBJECT_ATTRIBUTES) */
attr.Length *= 2;
status = pNtOpenKey(&key, am, &attr);
- todo_wine
- ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status);
+ ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status);
}
static void test_NtCreateKey(void)
More information about the wine-cvs
mailing list