Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6IoGoogleTest.cpp

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6IoGoogleTest.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6IoGoogleTest.cpp

@@ -162 +162 @@
   OriginalLength = Packet->Length;
 
-  UntrustedDuid = (EFI_DHCP6_DUID *)AllocateZeroPool (sizeof (EFI_DHCP6_DUID));
+  UntrustedDuid = (EFI_DHCP6_DUID *)AllocateZeroPool (OFFSET_OF (EFI_DHCP6_DUID, Duid) + sizeof (Duid));
   ASSERT_NE (UntrustedDuid, (EFI_DHCP6_DUID *)NULL);
 
@@ -764 +764 @@
              &Option,
              Dhcp6OptStatusCode,
-             SearchPatternLength,
+             HTONS (SearchPatternLength),
              (UINT8 *)&SearchPattern
              );
@@ -816 +816 @@
              &Option,
              Dhcp6OptStatusCode,
-             SearchPatternLength,
+             HTONS (SearchPatternLength),
              (UINT8 *)&SearchPattern
              );