Fix missing NULL pointer checks causing boot failure on 1meg machines.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/acpi.c b/src/acpi.c
index 107469f2d3ff1be104a190da0d5b0a3928da55f2..7bc662d0adfe3154e540a102d9f36f9f58e306c0 100644 (file)
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -496,6 +496,10 @@ static void* build_pcihp(void)
     int i;
 
     u8 *ssdt = malloc_high(sizeof ssdp_pcihp_aml);
+    if (!ssdt) {
+        warn_noalloc();
+        return NULL;
+    }
     memcpy(ssdt, ssdp_pcihp_aml, sizeof ssdp_pcihp_aml);
 
     /* Runtime patching of EJ0: to disable hotplug for a slot,

diff --git a/src/pmm.c b/src/pmm.c
index 82a0b1d0dc4fb61ff58605fe5683d904cb5323d0..c649fd838ffc8fc77fc90a593023adcda1502940 100644 (file)
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -214,7 +214,8 @@ malloc_fixupreloc(void)
     int i;
     for (i=0; i<ARRAY_SIZE(Zones); i++) {
         struct zone_s *zone = Zones[i];
-        zone->info->pprev = &zone->info;
+        if (zone->info)
+            zone->info->pprev = &zone->info;
     }
 
     // Add space free'd during relocation in f-segment to ZoneFSeg