MdeModulePkg/FvSimpleFileSystem:Fix a potential NULL dereference issue.

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / Expression.c

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index 1077b06669adbbb7d94319649560f89ba8d9eb36..e8829c1855fcbe50ca683893452345f6204e21b2 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -1323,6 +1323,7 @@ IfrCatenate (
   UINTN          Size;\r
   UINT16         Length0;\r
   UINT16         Length1;\r
+  UINT8          *TmpBuf;\r
 \r
   //\r
   // String[0] - The second string\r
@@ -1378,8 +1379,12 @@ IfrCatenate (
     Result->Buffer = AllocateZeroPool (Result->BufferLen);\r
     ASSERT (Result->Buffer != NULL);\r
 \r
-    CopyMem (Result->Buffer, GetBufferForValue(&Value[0]), Length0);\r
-    CopyMem (&Result->Buffer[Length0], GetBufferForValue(&Value[1]), Length1);\r
+    TmpBuf = GetBufferForValue(&Value[0]);\r
+    ASSERT (TmpBuf != NULL);\r
+    CopyMem (Result->Buffer, TmpBuf, Length0);\r
+    TmpBuf = GetBufferForValue(&Value[1]);\r
+    ASSERT (TmpBuf != NULL);\r
+    CopyMem (&Result->Buffer[Length0], TmpBuf, Length1);\r
   }\r
 Done:\r
   if (Value[0].Buffer != NULL) {\r
@@ -2372,6 +2377,8 @@ EvaluateExpression (
   EFI_HII_VALUE           QuestionVal;\r
   EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
 \r
+  StrPtr = NULL;\r
+\r
   //\r
   // Save current stack offset.\r
   //\r