Fixed uninitialized-pointer bug that manifested as a crash with

[refind] / refind / config.c

diff --git a/refind/config.c b/refind/config.c
index 8aa2850183157005b02457688a28d6da8a248538..b7851d4f33ebe6ff536855c81d18ab0cd435eb8c 100644 (file)
--- a/refind/config.c
+++ b/refind/config.c
@@ -524,6 +524,7 @@ VOID ReadConfig(CHAR16 *FileName)
        MyFreePool(GlobalConfig.DontScanFiles);
        GlobalConfig.DontScanFiles = StrDuplicate(DONT_SCAN_FILES);
        MergeStrings(&(GlobalConfig.DontScanFiles), MOK_NAMES, L',');
+       MergeStrings(&(GlobalConfig.DontScanFiles), FWUPDATE_NAMES, L',');
        MyFreePool(GlobalConfig.DontScanVolumes);
        GlobalConfig.DontScanVolumes = StrDuplicate(DONT_SCAN_VOLUMES);
        GlobalConfig.WindowsRecoveryFiles = StrDuplicate(WINDOWS_RECOVERY_FILES);
@@ -649,6 +650,8 @@ VOID ReadConfig(CHAR16 *FileName)
                    GlobalConfig.ShowTools[i - 1] = TAG_WINDOWS_RECOVERY;
                 } else if (MyStriCmp(FlagName, L"mok_tool")) {
                    GlobalConfig.ShowTools[i - 1] = TAG_MOK_TOOL;
+                } else if (MyStriCmp(FlagName, L"fwupdate")) {
+                   GlobalConfig.ShowTools[i - 1] = TAG_FWUPDATE_TOOL;
                 } else if (MyStriCmp(FlagName, L"csr_rotate")) {
                    GlobalConfig.ShowTools[i - 1] = TAG_CSR_ROTATE;
                 } else if (MyStriCmp(FlagName, L"firmware")) {
@@ -758,6 +761,8 @@ VOID ReadConfig(CHAR16 *FileName)
               ReadConfig(TokenList[1]);
            }
 
+        } else if (MyStriCmp(TokenList[0], L"enable_touch")) {
+           GlobalConfig.EnableTouch = HandleBoolean(TokenList, TokenCount);
         }
 
         FreeTokenLine(&TokenList, &TokenCount);