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

[HAL]

Browse source 
* Timo Kreuzer: Fix a NULL pointer dereference. CID 13453.

svn path=/trunk/; revision=54487
This commit is contained in:
Amine Khaldi 2011-11-24 11:25:40 +00:00
parent d96e0b80cf
commit 4696a40648
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/hal/halx86/acpi/halacpi.c
View file

@ -747,19 +747,22 @@ HalpAcpiTableCacheInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
/* Use HAL heap */ /* Use HAL heap */
HalpUnmapVirtualAddress(MappedAddress, TableLength); HalpUnmapVirtualAddress(MappedAddress, TableLength);
LoaderExtension = LoaderBlock->Extension;
} }
else else
{ {
/* Use Mm */ /* Use Mm */
MmUnmapIoSpace(MappedAddress, TableLength << PAGE_SHIFT); MmUnmapIoSpace(MappedAddress, TableLength << PAGE_SHIFT);
LoaderExtension = NULL;
} }
/* Cache the RSDT */ /* Cache the RSDT */
HalpAcpiCacheTable(&Rsdt->Header); HalpAcpiCacheTable(&Rsdt->Header);
/* Check for compatible loader block extension */ /* Check for compatible loader block extension */
LoaderExtension = LoaderBlock->Extension; if (LoaderExtension && (LoaderExtension->Size >= 0x58))
if (LoaderExtension->Size >= 0x58)
{ {
/* Compatible loader: did it provide an ACPI table override? */ /* Compatible loader: did it provide an ACPI table override? */
if ((LoaderExtension->AcpiTable) && (LoaderExtension->AcpiTableSize)) if ((LoaderExtension->AcpiTable) && (LoaderExtension->AcpiTableSize))