fixed one bug when calculate the string length.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Mtftp4Dxe / Mtftp4Support.c

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