X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FMtftp4Dxe%2FMtftp4Support.c;h=7cdbddc32d1b495be429b86aa9deb92590269a5b;hb=b7d3c63160fae758c1d0467caeecad169c733338;hp=903494ecb732fab970c0c48435bb1de5628888ed;hpb=687a2e5f6902fa26c7a1d7a7705e0747c4095125;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index 903494ecb7..7cdbddc32d 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -278,7 +278,7 @@ Mtftp4SendRequest (
   Mode    = Instance->Token->ModeStr;
 
   if (Mode == NULL) {
-    Mode = "octet";
+    Mode = (UINT8 *) "octet";
   }
 
   //
@@ -305,11 +305,16 @@ Mtftp4SendRequest (
   Packet->OpCode = HTONS (Instance->Operation);
   Cur            = Packet->Rrq.Filename;
   Cur            = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Token->Filename);
+  Cur           += AsciiStrLen ((CHAR8 *) Token->Filename) + 1;
   Cur            = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Mode);
+  Cur           += AsciiStrLen ((CHAR8 *) Mode) + 1;
 
   for (Index = 0; Index < Token->OptionCount; ++Index) {
-    Cur = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Options[Index].OptionStr);
-    Cur = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Options[Index].ValueStr);
+    Cur  = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Options[Index].OptionStr);
+    Cur += AsciiStrLen ((CHAR8 *) Options[Index].OptionStr) + 1;
+
+    Cur  = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Options[Index].ValueStr);
+    Cur += AsciiStrLen ((CHAR8 *) (CHAR8 *) Options[Index].ValueStr) + 1;
   }
 
   return Mtftp4SendPacket (Instance, Nbuf);
@@ -462,7 +467,7 @@ Mtftp4SendPacket (
              Instance->UnicastPort,
              Packet,
              &UdpPoint,
-             Instance->Gateway,
+             0,
              Mtftp4OnPacketSent,
              Instance
              );
@@ -519,7 +524,7 @@ Mtftp4Retransmit (
              Instance->UnicastPort,
              Instance->LastPacket,
              &UdpPoint,
-             Instance->Gateway,
+             0,
              Mtftp4OnPacketSent,
              Instance
              );
@@ -578,7 +583,7 @@ Mtftp4OnTimerTick (
       Mtftp4SendError (
          Instance,
          EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,
-         "User aborted the transfer in time out"
+         (UINT8 *) "User aborted the transfer in time out"
          );
 
       Mtftp4CleanOperation (Instance, EFI_ABORTED);