ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Timer routines must check for NULL timer name.

This commit is contained in:
Jukka Heinonen 2003-06-04 20:14:24 +00:00 committed by Alexandre Julliard
parent 4ea0b7008c
commit 38fa857648
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ntdll/sync.c
View File

@ -297,6 +297,7 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE *handle,
IN const OBJECT_ATTRIBUTES *oa OPTIONAL, IN const OBJECT_ATTRIBUTES *oa OPTIONAL,
IN TIMER_TYPE timer_type) IN TIMER_TYPE timer_type)
{ {
DWORD len = (oa && oa->ObjectName) ? oa->ObjectName->Length : 0;
NTSTATUS status; NTSTATUS status;
if (timer_type != NotificationTimer && timer_type != SynchronizationTimer) 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->manual = (timer_type == NotificationTimer) ? TRUE : FALSE;
req->inherit = oa && (oa->Attributes & OBJ_INHERIT); req->inherit = oa && (oa->Attributes & OBJ_INHERIT);
if (oa && oa->ObjectName->Length) if (len) wine_server_add_data( req, oa->ObjectName->Buffer, len );
wine_server_add_data( req, oa->ObjectName->Buffer, oa->ObjectName->Length );
status = wine_server_call( req ); status = wine_server_call( req );
*handle = reply->handle; *handle = reply->handle;
} }
@ -324,6 +324,7 @@ NTSTATUS WINAPI NtOpenTimer(OUT PHANDLE handle,
IN ACCESS_MASK access, IN ACCESS_MASK access,
IN const OBJECT_ATTRIBUTES* oa ) IN const OBJECT_ATTRIBUTES* oa )
{ {
DWORD len = (oa && oa->ObjectName) ? oa->ObjectName->Length : 0;
NTSTATUS status; NTSTATUS status;
if (oa && oa->Length >= MAX_PATH * sizeof(WCHAR)) if (oa && oa->Length >= MAX_PATH * sizeof(WCHAR))
@ -333,8 +334,7 @@ NTSTATUS WINAPI NtOpenTimer(OUT PHANDLE handle,
{ {
req->access = access; req->access = access;
req->inherit = oa && (oa->Attributes & OBJ_INHERIT); req->inherit = oa && (oa->Attributes & OBJ_INHERIT);
if (oa && oa->ObjectName->Length) if (len) wine_server_add_data( req, oa->ObjectName->Buffer, len );
wine_server_add_data( req, oa->ObjectName->Buffer, oa->ObjectName->Length );
status = wine_server_call( req ); status = wine_server_call( req );
*handle = reply->handle; *handle = reply->handle;
} }