Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Free the header after possibly accessing it when tracing is enabled. Also guard

Browse Source 
the trace output against header being NULL (i.e. failed to map).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39958 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2010-12-27 00:51:05 +00:00
parent cd7155635d
commit f3eff1ca00
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/system/boot/platform/bios_ia32/acpi.cpp
View File

@ -70,7 +70,7 @@ acpi_find_table(const char* signature)
sNumEntries = (sAcpiRsdt->length
- sizeof(acpi_descriptor_header)) / 4;
}
if (sNumEntries <= 0) {
TRACE(("acpi: root system description table is empty\n"));
return NULL;
@ -89,12 +89,15 @@ acpi_find_table(const char* signature)
if (header == NULL
|| strncmp(header->signature, signature, 4) != 0) {
// not interesting for us
TRACE(("acpi: Looking for '%.4s'. Skipping '%.4s'\n",
signature, header != NULL ? header->signature : "null"));
if (header != NULL)
mmu_free(header, sizeof(acpi_descriptor_header));
TRACE(("acpi: Looking for '%.4s'. Skipping '%.4s'\n",
signature, header->signature));
continue;
}
TRACE(("acpi: Found '%.4s' @ %p\n", signature, pointer));
return header;
}