Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVAPI32]

Browse source 
Add or fix parameter checks.

svn path=/trunk/; revision=55417
This commit is contained in:
Eric Kohl 2012-02-04 19:56:21 +00:00
parent 9fa8f0915e
commit 5a51670178
1 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

59
reactos/dll/win32/advapi32/service/eventlog.c
View file

@ -452,7 +452,7 @@ GetNumberOfEventLogRecords(IN HANDLE hEventLog,
TRACE("%p, %p\n", hEventLog, NumberOfRecords); TRACE("%p, %p\n", hEventLog, NumberOfRecords);
if(!NumberOfRecords) if (NumberOfRecords == NULL)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
@ -497,7 +497,7 @@ GetOldestEventLogRecord(IN HANDLE hEventLog,
TRACE("%p, %p\n", hEventLog, OldestRecord); TRACE("%p, %p\n", hEventLog, OldestRecord);
if(!OldestRecord) if (OldestRecord == NULL)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
@ -630,16 +630,15 @@ OpenBackupEventLogW(IN LPCWSTR lpUNCServerName,
if (lpFileName == NULL) if (lpFileName == NULL)
{ {
RtlInitUnicodeString(&FileNameW, NULL); SetLastError(ERROR_INVALID_PARAMETER);
return NULL;
} }
else
if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileNameW,
NULL, NULL))
{ {
if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileNameW, SetLastError(ERROR_INVALID_PARAMETER);
NULL, NULL)) return NULL;
{
SetLastError(ERROR_INVALID_PARAMETER);
return NULL;
}
} }
RpcTryExcept RpcTryExcept
@ -802,22 +801,32 @@ ReadEventLogA(IN HANDLE hEventLog,
{ {
NTSTATUS Status; NTSTATUS Status;
DWORD bytesRead, minNumberOfBytesNeeded; DWORD bytesRead, minNumberOfBytesNeeded;
DWORD dwFlags;
TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n",
hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, hEventLog, dwReadFlags, dwRecordOffset, lpBuffer,
nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded);
if(!pnBytesRead || !pnMinNumberOfBytesNeeded) if (lpBuffer == NULL ||
pnBytesRead == NULL ||
pnMinNumberOfBytesNeeded == NULL)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
} }
/* If buffer is NULL set nNumberOfBytesToRead to 0 to prevent rpcrt4 from dwFlags = dwReadFlags & (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ);
trying to access a null pointer */ if (dwFlags == (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ))
if (!lpBuffer)
{ {
nNumberOfBytesToRead = 0; SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
dwFlags = dwReadFlags & (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ);
if (dwFlags == (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ))
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
} }
RpcTryExcept RpcTryExcept
@ -872,22 +881,32 @@ ReadEventLogW(IN HANDLE hEventLog,
{ {
NTSTATUS Status; NTSTATUS Status;
DWORD bytesRead, minNumberOfBytesNeeded; DWORD bytesRead, minNumberOfBytesNeeded;
DWORD dwFlags;
TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n",
hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, hEventLog, dwReadFlags, dwRecordOffset, lpBuffer,
nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded);
if(!pnBytesRead || !pnMinNumberOfBytesNeeded) if (lpBuffer == NULL ||
pnBytesRead == NULL ||
pnMinNumberOfBytesNeeded == NULL)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
} }
/* If buffer is NULL set nNumberOfBytesToRead to 0 to prevent rpcrt4 from dwFlags = dwReadFlags & (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ);
trying to access a null pointer */ if (dwFlags == (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ))
if (!lpBuffer)
{ {
nNumberOfBytesToRead = 0; SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
dwFlags = dwReadFlags & (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ);
if (dwFlags == (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ))
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
} }
RpcTryExcept RpcTryExcept