1 files changed, 8 insertions, 4 deletions
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 8a46972f7d..0e8efd18d0 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -260,8 +260,9 @@ SetPassword (
   //
   // Retrive uncommitted data from Browser
   //
-  Configuration = (DRIVER_SAMPLE_CONFIGURATION *) HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION));
-  if (Configuration != NULL) {
+  Configuration = AllocateZeroPool (sizeof (DRIVER_SAMPLE_CONFIGURATION));
+  ASSERT (Configuration != NULL);
+  if (HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {
     //
     // Update password's clear text in the screen
     //
@@ -277,10 +278,13 @@ SetPassword (
        (UINT8 *) Configuration,
        NULL
        );
-    
-    FreePool (Configuration);
   }
 
+  //
+  // Free Configuration Buffer
+  //
+  FreePool (Configuration);
+
 
   //
   // Set password