X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FHiiDatabaseDxe%2FDatabase.c;h=918559e54490b4c875dba51e27ff89bad0872646;hp=b1a3374991ecadc58a5361d5694f7c4fa1c4648b;hb=f324bf4dbeda4d64b769bd005331e8f9404b692d;hpb=96ff65a1fb627823efaf4dc7cd01a424fa5297e8

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index b1a3374991..918559e544 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -659,7 +659,7 @@ ExportFormPackages (
   for (Link = PackageList->FormPkgHdr.ForwardLink; Link != &PackageList->FormPkgHdr; Link = Link->ForwardLink) {
     FormPackage = CR (Link, HII_IFR_PACKAGE_INSTANCE, IfrEntry, HII_IFR_PACKAGE_SIGNATURE);
     PackageLength += FormPackage->FormPkgHdr.Length;
-    if (PackageLength + *ResultSize + UsedSize <= BufferSize) {
+    if ((Buffer != NULL) && (PackageLength + *ResultSize + UsedSize <= BufferSize)) {
       //
       // Invoke registered notification if exists
       //
@@ -809,7 +809,7 @@ InsertStringPackage (
   AsciiStrCpy (Language, (CHAR8 *) PackageHdr + HeaderSize - LanguageSize);
   for (Link = PackageList->StringPkgHdr.ForwardLink; Link != &PackageList->StringPkgHdr; Link = Link->ForwardLink) {
     StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);
-    if (R8_EfiLibCompareLanguage (Language, StringPackage->StringPkgHdr->Language)) {
+    if (HiiCompareLanguage (Language, StringPackage->StringPkgHdr->Language)) {
       FreePool (Language);
       return EFI_UNSUPPORTED;
     }
@@ -3229,8 +3229,7 @@ HiiExportPackageLists (
                  (EFI_HII_PACKAGE_LIST_HEADER *)((UINT8 *) Buffer + UsedSize)
                  );
       ASSERT_EFI_ERROR (Status);
-    }
-    else if (Handle != NULL && Node->Handle == Handle) {
+    } else if (Handle != NULL && Node->Handle == Handle) {
       Status = ExportPackageList (
                  Private,
                  Handle,