]> git.proxmox.com Git - mirror_edk2.git/commitdiff
MdeModulePkg: Code logic optimization for Ip4Dxe driver
authorfanwang2 <fan.wang@intel.com>
Fri, 10 Jul 2015 09:01:42 +0000 (09:01 +0000)
committerfanwang2 <fanwang2@Edk2>
Fri, 10 Jul 2015 09:01:42 +0000 (09:01 +0000)
Move null check before set value to address to avoid null address dereferenced.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: fanwang2 <fan.wang@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17924 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c

index 27dae5855380ea7caf93e8133bf19cfa92fa11ea..381dcb1e974a706a2a46c68a6e9a1a05c3dfbf23 100644 (file)
@@ -874,6 +874,10 @@ Ip4FormExtractConfig (
   EFI_STRING                       FormResult;\r
   UINTN                            Size;\r
   UINTN                            BufferSize;\r
+\r
+  if (Progress == NULL || Results == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
   \r
   Status             = EFI_SUCCESS; \r
   IfrFormNvData      = NULL;\r
@@ -887,10 +891,6 @@ Ip4FormExtractConfig (
   BufferSize         = sizeof (IP4_CONFIG2_IFR_NVDATA);\r
   *Progress          = Request;\r
   \r
-  if (Progress == NULL || Results == NULL) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-  \r
   //\r
   // Check Request data in <ConfigHdr>.\r
   //\r