Add in parameter checking to pass UEFI HII SCT test.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6567 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
index edbc34a3e49f4cdc2eb4575ec9fb9cdad7742887..738020aafe61d6c268ad9441ae79086a777cce5b 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
@@ -403,11 +403,20 @@ ThunkExtractConfig (
   VOID                                        *Data;\r
   UINTN                                       DataSize;\r
 \r
+  if (Request == NULL) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   Data = NULL;\r
   ConfigAccess = CONFIG_ACCESS_PRIVATE_FROM_PROTOCOL (This);\r
 \r
   BufferStorage = GetStorageFromConfigString (ConfigAccess->ThunkContext->FormSet, Request);\r
 \r
+  if (BufferStorage == NULL) {\r
+    *Progress = (EFI_STRING) Request;\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {\r
     //\r
     // NvMapOverride is not used. Get the Storage data from EFI Variable or Framework Form Callback.\r
@@ -491,11 +500,20 @@ ThunkRouteConfig (
   BOOLEAN                                     ResetRequired;\r
   BOOLEAN                                     DataAllocated;\r
 \r
+  if (Configuration == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
   Data = NULL;\r
   ConfigAccess = CONFIG_ACCESS_PRIVATE_FROM_PROTOCOL (This);\r
 \r
   BufferStorage = GetStorageFromConfigString (ConfigAccess->ThunkContext->FormSet, Configuration);\r
 \r
+  if (BufferStorage == NULL) {\r
+    *Progress = Configuration;\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   DataSize2     = BufferStorage->Size;\r
   if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {\r
     DataAllocated = TRUE;\r