X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FArpDxe%2FArpImpl.c;h=b46c7047eefadaed9438b6c0e06118d77dc6deef;hp=93b4c1020037373b77424c579c11cf468a826350;hb=687a2e5f6902fa26c7a1d7a7705e0747c4095125;hpb=4a8f7cceccde9f40f55cae415e10d80906a84919

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index 93b4c10200..b46c7047ee 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -54,7 +54,7 @@ ArpInitInstance (
   Instance->Signature  = ARP_INSTANCE_DATA_SIGNATURE;
   Instance->ArpService = ArpService;
 
-  CopyMem (&Instance->ArpProto, &mEfiArpProtocolTemplate, sizeof (ARP_SERVICE_DATA));
+  CopyMem (&Instance->ArpProto, &mEfiArpProtocolTemplate, sizeof (Instance->ArpProto));
 
   Instance->Configured = FALSE;
   Instance->Destroyed  = FALSE;
@@ -263,7 +263,9 @@ ArpOnFrameRcvd (
       }
     }
 
-    NetListRemoveEntry (&CacheEntry->List);
+    if (!IsListEmpty (&CacheEntry->List)) {
+      NetListRemoveEntry (&CacheEntry->List);
+    }
 
     //
     // Fill the addresses into the CacheEntry.
@@ -912,7 +914,7 @@ ArpConfigureInstance (
       //
       // Save the configuration.
       //
-      CopyMem (OldConfigData, ConfigData, sizeof (EFI_ARP_CONFIG_DATA));
+      CopyMem (OldConfigData, ConfigData, sizeof (*OldConfigData));
 
       OldConfigData->StationAddress = NetAllocatePool (OldConfigData->SwAddressLength);
       if (OldConfigData->StationAddress == NULL) {