Skip to content

W
wine-winehq
Commit 38fa8576 authored by Jukka Heinonen's avatar Jukka Heinonen Committed by Alexandre Julliard
Browse files
Options

Timer routines must check for NULL timer name.

parent 4ea0b700
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/ntdll/sync.c
View file @ 38fa8576
......@@ -297,6 +297,7 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE *handle,
IN const OBJECT_ATTRIBUTES *oa OPTIONAL,
IN TIMER_TYPE timer_type)
{
DWORD len = (oa && oa->ObjectName) ? oa->ObjectName->Length : 0;
NTSTATUS status;
if (timer_type != NotificationTimer && timer_type != SynchronizationTimer)
......@@ -306,8 +307,7 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE *handle,
{
req->manual = (timer_type == NotificationTimer) ? TRUE : FALSE;
req->inherit = oa && (oa->Attributes & OBJ_INHERIT);
if (oa && oa->ObjectName->Length)
wine_server_add_data( req, oa->ObjectName->Buffer, oa->ObjectName->Length );
if (len) wine_server_add_data( req, oa->ObjectName->Buffer, len );
status = wine_server_call( req );
*handle = reply->handle;
}
......@@ -324,6 +324,7 @@ NTSTATUS WINAPI NtOpenTimer(OUT PHANDLE handle,
IN ACCESS_MASK access,
IN const OBJECT_ATTRIBUTES* oa )
{
DWORD len = (oa && oa->ObjectName) ? oa->ObjectName->Length : 0;
NTSTATUS status;
if (oa && oa->Length >= MAX_PATH * sizeof(WCHAR))
......@@ -333,8 +334,7 @@ NTSTATUS WINAPI NtOpenTimer(OUT PHANDLE handle,
{
req->access = access;
req->inherit = oa && (oa->Attributes & OBJ_INHERIT);
if (oa && oa->ObjectName->Length)
wine_server_add_data( req, oa->ObjectName->Buffer, oa->ObjectName->Length );
if (len) wine_server_add_data( req, oa->ObjectName->Buffer, len );
status = wine_server_call( req );
*handle = reply->handle;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment