Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-19 12:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
Fix Coverity defects : CID 716579, 716580 and 716582.

svn path=/trunk/; revision=57499
This commit is contained in:
Hermès Bélusca-Maïto 2012-10-06 18:46:13 +00:00
parent ae50229cb5
commit ebd10c73a3
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/ntoskrnl/fstub/fstubex.c
View file

@ -1605,7 +1605,7 @@ FstubWritePartitionTableMBR(IN PDISK_INFORMATION Disk,
DriveLayout);
/* Free allocated structure and return */
ExFreePool(DriveLayout);
ExFreePoolWithTag(DriveLayout, 'BtsF');
return Status;
}

2
reactos/ntoskrnl/io/iomgr/driver.c
View file

@ -1770,7 +1770,7 @@ IoAllocateDriverObjectExtension(IN PDRIVER_OBJECT DriverObject,
if (!Inserted)
{
/* Free the entry and fail */
ExFreePool(NewDriverExtension);
ExFreePoolWithTag(NewDriverExtension, TAG_DRIVER_EXTENSION);
return STATUS_OBJECT_NAME_COLLISION;
}

20
reactos/ntoskrnl/io/iomgr/error.c
View file

@ -486,8 +486,8 @@ IoAllocateErrorLogEntry(IN PVOID IoObject,
{
PERROR_LOG_ENTRY LogEntry;
ULONG LogEntrySize;
PDRIVER_OBJECT DriverObject;
PDEVICE_OBJECT DeviceObject;
PDRIVER_OBJECT DriverObject;
/* Make sure we have an object */
if (!IoObject) return NULL;
@ -495,13 +495,6 @@ IoAllocateErrorLogEntry(IN PVOID IoObject,
/* Check if we're past our buffer */
if (IopTotalLogSize > PAGE_SIZE) return NULL;
/* Calculate the total size and allocate it */
LogEntrySize = sizeof(ERROR_LOG_ENTRY) + EntrySize;
LogEntry = ExAllocatePoolWithTag(NonPagedPool,
LogEntrySize,
TAG_ERROR_LOG);
if (!LogEntry) return NULL;
/* Check if this is a device object or driver object */
if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DEVICE)
{
@ -511,9 +504,9 @@ IoAllocateErrorLogEntry(IN PVOID IoObject,
}
else if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DRIVER)
{
/* It's a driver, so we don' thave a device */
/* It's a driver, so we don't have a device */
DeviceObject = NULL;
DriverObject = IoObject;
DriverObject = (PDRIVER_OBJECT)IoObject;
}
else
{
@ -521,6 +514,13 @@ IoAllocateErrorLogEntry(IN PVOID IoObject,
return NULL;
}
/* Calculate the total size and allocate it */
LogEntrySize = sizeof(ERROR_LOG_ENTRY) + EntrySize;
LogEntry = ExAllocatePoolWithTag(NonPagedPool,
LogEntrySize,
TAG_ERROR_LOG);
if (!LogEntry) return NULL;
/* Reference the Objects */
if (DeviceObject) ObReferenceObject(DeviceObject);
if (DriverObject) ObReferenceObject(DriverObject);