From de49b23c7e4b63aab635870f543a3305e709d697 Mon Sep 17 00:00:00 2001
From: Vegnish Rao <vegnishrao93@gmail.com>
Date: Wed, 8 Apr 2020 08:22:24 +0800
Subject: [PATCH] Fix Klockwork issue flagged in BootloaderCommonPkg (#646)

Fix for: Klockwork flags possible null pointer variable 'CompressHdr'
being dereferenced.

Signed-off-by: Vegnish Rao <vegnish.rao.paramesura.rao@intel.com>

Co-authored-by: Vegnish Rao <vegnish.rao.paramesura.rao@intel.com>
---
 BootloaderCommonPkg/Library/ContainerLib/ContainerLib.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BootloaderCommonPkg/Library/ContainerLib/ContainerLib.c b/BootloaderCommonPkg/Library/ContainerLib/ContainerLib.c
index 2001f68c..0a52496c 100644
--- a/BootloaderCommonPkg/Library/ContainerLib/ContainerLib.c
+++ b/BootloaderCommonPkg/Library/ContainerLib/ContainerLib.c
@@ -760,6 +760,10 @@ LoadComponentWithCallback (
   // Component must have LOADER_COMPRESSED_HEADER
   Status = EFI_UNSUPPORTED;
   CompressHdr  = (LOADER_COMPRESSED_HEADER *)CompData;
+  if (CompressHdr == NULL) {
+    return EFI_NOT_FOUND;
+  }
+
   if (IS_COMPRESSED (CompressHdr)) {
     SignedDataLen = sizeof (LOADER_COMPRESSED_HEADER) + CompressHdr->CompressedSize;
     if (SignedDataLen <= CompLen) {