Fixed memory-allocation bug.

diff --git a/NEWS.txt b/NEWS.txt
index a215802122c41708ffebf500ae28d3aac6cd220e..c0f1dcb3017919d36fc82b589fb8226b252dc6ec 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,9 @@
+0.7.10 (?/??/2014):
+-------------------
+
+- Fixed memory-allocation bug that could cause error message displays,
+  and possibly hangs, when re-scanning boot loaders.
+
 0.7.9 (4/20/2014):
 ------------------
 

diff --git a/refind/main.c b/refind/main.c
index 4a1b57ae9d641795e688d69f6f93601d548f0ca7..ae35fa3efef1686c628e0805afb9f2fa2f0422ba 100644 (file)
--- a/refind/main.c
+++ b/refind/main.c
@@ -159,7 +159,7 @@ static VOID AboutrEFInd(VOID)
 {
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.7.9");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.7.9.1");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2014 Roderick W. Smith");
@@ -1110,7 +1110,7 @@ static BOOLEAN ShouldScan(REFIT_VOLUME *Volume, CHAR16 *Path) {
    VolName = NULL;
 
    // See if Volume is in GlobalConfig.DontScanDirs....
-   while ((DontScanDir = FindCommaDelimited(GlobalConfig.DontScanDirs, i++)) && ScanIt) {
+   while (ScanIt && (DontScanDir = FindCommaDelimited(GlobalConfig.DontScanDirs, i++))) {
       SplitVolumeAndFilename(&DontScanDir, &VolName);
       CleanUpPathNameSlashes(DontScanDir);
       VolumeNumberToName(Volume, &VolName);
@@ -1124,6 +1124,7 @@ static BOOLEAN ShouldScan(REFIT_VOLUME *Volume, CHAR16 *Path) {
       MyFreePool(DontScanDir);
       MyFreePool(VolName);
       DontScanDir = NULL;
+      VolName = NULL;
    } // while()
 
    return ScanIt;