From be4b43e03fb2547777ba1aac9a6000a864080d25 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 2 Jan 2011 14:44:33 +0000 Subject: [PATCH] At least theoretically kernelSettings and safemodeSettings can be NULL (CID 4230). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40069 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/loader/load_driver_settings.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/system/boot/loader/load_driver_settings.cpp b/src/system/boot/loader/load_driver_settings.cpp index b38ead2851..9bcd702fac 100644 --- a/src/system/boot/loader/load_driver_settings.cpp +++ b/src/system/boot/loader/load_driver_settings.cpp @@ -64,10 +64,12 @@ static void apply_boot_settings(void* kernelSettings, void* safemodeSettings) { #if B_HAIKU_PHYSICAL_BITS > 32 - if (get_driver_boolean_parameter(kernelSettings, "4gb_memory_limit", false, - false) - || get_driver_boolean_parameter(safemodeSettings, - B_SAFEMODE_4_GB_MEMORY_LIMIT, false, false)) { + if ((kernelSettings != NULL + && get_driver_boolean_parameter(kernelSettings, "4gb_memory_limit", + false, false)) + || (safemodeSettings != NULL + && get_driver_boolean_parameter(safemodeSettings, + B_SAFEMODE_4_GB_MEMORY_LIMIT, false, false))) { ignore_physical_memory_ranges_beyond_4gb(); } #endif