tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NetworkPkg: Fix an error that return type differs from the left one when assigned. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: jiaxinwu <jiaxin.wu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17921 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Zhang Lubo 2015-07-10 06:50:41 +00:00 committed by luobozhang
parent c6910aeda3
commit 7c6c4ac801
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NetworkPkg/Application/IfConfig6/IfConfig6.c
View File

@ -127,7 +127,7 @@ SplitStrToList (
ARG_LIST *ArgList; ARG_LIST *ArgList;
ARG_LIST *ArgNode; ARG_LIST *ArgNode;
if (*String == L'\0' || *String == NULL) { if (String == NULL || *String == L'\0') {
return NULL; return NULL;
} }

59
NetworkPkg/Mtftp6Dxe/Mtftp6Support.c
View File

@ -452,13 +452,16 @@ Mtftp6SendRequest (
EFI_MTFTP6_PACKET *Packet; EFI_MTFTP6_PACKET *Packet;
EFI_MTFTP6_OPTION *Options; EFI_MTFTP6_OPTION *Options;
EFI_MTFTP6_TOKEN *Token; EFI_MTFTP6_TOKEN *Token;
RETURN_STATUS Status;
NET_BUF *Nbuf; NET_BUF *Nbuf;
UINT8 *Mode; UINT8 *Mode;
UINT8 *Cur; UINT8 *Cur;
UINT32 Len1;
UINT32 Len2;
UINT32 Len;
UINTN Index; UINTN Index;
UINT32 BufferLength;
UINTN FileNameLength;
UINTN ModeLength;
UINTN OptionStrLength;
UINTN ValueStrLength;
Token = Instance->Token; Token = Instance->Token;
Options = Token->OptionList; Options = Token->OptionList;
@ -487,47 +490,59 @@ Mtftp6SendRequest (
// //
// Compute the size of new Mtftp6 packet. // Compute the size of new Mtftp6 packet.
// //
Len1 = (UINT32) AsciiStrLen ((CHAR8 *) Token->Filename); FileNameLength = AsciiStrLen ((CHAR8 *) Token->Filename);
Len2 = (UINT32) AsciiStrLen ((CHAR8 *) Mode); ModeLength = AsciiStrLen ((CHAR8 *) Mode);
Len = Len1 + Len2 + 4; BufferLength = (UINT32) FileNameLength + (UINT32) ModeLength + 4;
for (Index = 0; Index < Token->OptionCount; Index++) { for (Index = 0; Index < Token->OptionCount; Index++) {
Len1 = (UINT32) AsciiStrLen ((CHAR8 *) Options[Index].OptionStr); OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);
Len2 = (UINT32) AsciiStrLen ((CHAR8 *) Options[Index].ValueStr); ValueStrLength = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);
Len += Len1 + Len2 + 2; BufferLength += (UINT32) OptionStrLength + (UINT32) ValueStrLength + 2;
} }
// //
// Allocate a packet then copy the data. // Allocate a packet then copy the data.
// //
if ((Nbuf = NetbufAlloc (Len)) == NULL) { if ((Nbuf = NetbufAlloc (BufferLength)) == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
// //
// Copy the opcode, filename and mode into packet. // Copy the opcode, filename and mode into packet.
// //
Packet = (EFI_MTFTP6_PACKET *) NetbufAllocSpace (Nbuf, Len, FALSE); Packet = (EFI_MTFTP6_PACKET *) NetbufAllocSpace (Nbuf, BufferLength, FALSE);
ASSERT (Packet != NULL); ASSERT (Packet != NULL);
Packet->OpCode = HTONS (Operation); Packet->OpCode = HTONS (Operation);
BufferLength -= sizeof (Packet->OpCode);
Cur = Packet->Rrq.Filename; Cur = Packet->Rrq.Filename;
Cur = (UINT8 *) AsciiStrCpyS ((CHAR8 *) Cur, Len - 2, (CHAR8 *) Token->Filename); Status = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Token->Filename);
Cur += AsciiStrLen ((CHAR8 *) Token->Filename) + 1; ASSERT_EFI_ERROR (Status);
Cur = (UINT8 *) AsciiStrCpyS ((CHAR8 *) Cur, Len - 2 - (AsciiStrLen ((CHAR8 *) Token->Filename) + 1), (CHAR8 *) Mode); BufferLength -= (UINT32) (FileNameLength + 1);
Cur += AsciiStrLen ((CHAR8 *) Mode) + 1; Cur += FileNameLength + 1;
Len -= ((UINT32) AsciiStrLen ((CHAR8 *) Token->Filename) + (UINT32) AsciiStrLen ((CHAR8 *) Mode) + 4); Status = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Mode);
ASSERT_EFI_ERROR (Status);
BufferLength -= (UINT32) (ModeLength + 1);
Cur += ModeLength + 1;
// //
// Copy all the extension options into the packet. // Copy all the extension options into the packet.
// //
for (Index = 0; Index < Token->OptionCount; ++Index) { for (Index = 0; Index < Token->OptionCount; ++Index) {
Cur = (UINT8 *) AsciiStrCpyS ((CHAR8 *) Cur, Len, (CHAR8 *) Options[Index].OptionStr); OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);
Cur += AsciiStrLen ((CHAR8 *) Options[Index].OptionStr) + 1; ValueStrLength = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);
Len -= (UINT32)(AsciiStrLen ((CHAR8 *) Options[Index].OptionStr) + 1);
Cur = (UINT8 *) AsciiStrCpyS ((CHAR8 *) Cur, Len, (CHAR8 *) Options[Index].ValueStr); Status = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].OptionStr);
Cur += AsciiStrLen ((CHAR8 *) (CHAR8 *) Options[Index].ValueStr) + 1; ASSERT_EFI_ERROR (Status);
Len -= (UINT32)(AsciiStrLen ((CHAR8 *) Options[Index].ValueStr) + 1); BufferLength -= (UINT32) (OptionStrLength + 1);
Cur += OptionStrLength + 1;
Status = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].ValueStr);
ASSERT_EFI_ERROR (Status);
BufferLength -= (UINT32) (ValueStrLength + 1);
Cur += ValueStrLength + 1;
} }
// //