From 8aa6ebe83f91fcd5e1a67d316e444f4ac8b1319d Mon Sep 17 00:00:00 2001
From: Star Zeng <star.zeng@intel.com>
Date: Mon, 2 Nov 2015 01:42:51 +0000
Subject: [PATCH] MdeModulePkg SmbiosMeasurementDxe: NULL check to String from
 GetSmbiosStringById

When StringId is not 0, String returned from GetSmbiosStringById is expected to non-NULL.
Add ASSERT (String != NULL); to ensure this.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Shumin Qiu <shumin.qiu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Shumin Qiu <shumin.qiu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18713 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
index 5aafabfced..f9e0196677 100644
--- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
+++ b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
@@ -286,6 +286,7 @@ FilterSmbiosEntry (
           if (StringId != 0) {
             // set ' ' for string field
             String = GetSmbiosStringById (TableEntry, StringId, &StringLen);
+            ASSERT (String != NULL);
             //DEBUG ((EFI_D_INFO,"StrId(0x%x)-%a(%d)\n", StringId, String, StringLen));
             SetMem (String, StringLen, ' ');
           }