X-Git-Url: https://code.delx.au/refind/blobdiff_plain/4c9f41e161bd197922912efbcf4cc676077d5c00..480ba418c97ece5557ac0efc5dc189ff19fb8b8f:/refind/driver_support.c

diff --git a/refind/driver_support.c b/refind/driver_support.c
index 000b410..a547d65 100644
--- a/refind/driver_support.c
+++ b/refind/driver_support.c
@@ -19,6 +19,7 @@
  */
 
 #include "driver_support.h"
+#include "lib.h"
 #include "../include/refit_call_wrapper.h"
 
 #ifdef __MAKEWITH_GNUEFI
@@ -58,14 +59,14 @@ LibScanHandleDatabase (
   UINTN                               OpenInfoIndex;
   UINTN                               ChildIndex;
   BOOLEAN                             DriverBindingHandleIndexValid;
-  BOOLEAN                             ControllerHandleIndexValid;
+//  BOOLEAN                             ControllerHandleIndexValid;
 
   DriverBindingHandleIndexValid = FALSE;
   if (DriverBindingHandleIndex != NULL) {
     *DriverBindingHandleIndex = 0xffffffff;
   }
 
-  ControllerHandleIndexValid = FALSE;
+//  ControllerHandleIndexValid = FALSE;
   if (ControllerHandleIndex != NULL) {
     *ControllerHandleIndex = 0xffffffff;
   }
@@ -110,7 +111,7 @@ LibScanHandleDatabase (
 
     if (ControllerHandle != NULL && ControllerHandleIndex != NULL && (*HandleBuffer)[HandleIndex] == ControllerHandle) {
       *ControllerHandleIndex      = (UINT32) HandleIndex;
-      ControllerHandleIndexValid  = TRUE;
+//      ControllerHandleIndexValid  = TRUE;
     }
 
   }
@@ -228,24 +229,19 @@ LibScanHandleDatabase (
             }
           }
 
-          FreePool (OpenInfo);
+          MyFreePool (OpenInfo);
         }
       }
 
-      FreePool (ProtocolGuidArray);
+      MyFreePool (ProtocolGuidArray);
     }
   }
 
   return EFI_SUCCESS;
 
 Error:
-  if (*HandleType != NULL) {
-    FreePool (*HandleType);
-  }
-
-  if (*HandleBuffer != NULL) {
-    FreePool (*HandleBuffer);
-  }
+  MyFreePool (*HandleType);
+  MyFreePool (*HandleBuffer);
 
   *HandleCount  = 0;
   *HandleBuffer = NULL;