Revision: 13903
http://edk2.svn.sourceforge.net/edk2/?rev=13903&view=rev
Author: ydong10
Date: 2012-11-01 02:10:31 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Add more check to make code more safely.
Signed-off-by: Eric Dong <[email protected]>
Reviewed-by: Ouyang Qian <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
trunk/edk2/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
Modified: trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c 2012-10-31
09:33:40 UTC (rev 13902)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c 2012-11-01
02:10:31 UTC (rev 13903)
@@ -240,6 +240,7 @@
// update is omitted.
//
Icmp = (IP4_ICMP_QUERY_HEAD *) NetbufGetByte (Data, 0, NULL);
+ ASSERT (Icmp != NULL);
Icmp->Head.Type = ICMP_ECHO_REPLY;
Icmp->Head.Checksum = 0;
Icmp->Head.Checksum = (UINT16) (~NetblockChecksum ((UINT8 *) Icmp,
Data->TotalSize));
Modified: trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c 2012-10-31
09:33:40 UTC (rev 13902)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c 2012-11-01
02:10:31 UTC (rev 13903)
@@ -849,7 +849,8 @@
goto DROP;
}
- Head = (IP4_HEAD *) NetbufGetByte (Packet, 0, NULL);
+ Head = (IP4_HEAD *) NetbufGetByte (Packet, 0, NULL);
+ ASSERT (Head != NULL);
OptionLen = (Head->HeadLen << 2) - IP4_MIN_HEADLEN;
if (OptionLen > 0) {
Option = (UINT8 *) (Head + 1);
@@ -899,6 +900,7 @@
// is transfered to the packet process logic.
//
Head = (IP4_HEAD *) NetbufGetByte (Packet, 0, NULL);
+ ASSERT (Head != NULL);
Status = Ip4PreProcessPacket (
IpSb,
&Packet,
Modified: trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
2012-10-31 09:33:40 UTC (rev 13902)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
2012-11-01 02:10:31 UTC (rev 13903)
@@ -465,6 +465,7 @@
// to the connected port
//
Value = *((UINT16 *) NetbufGetByte (Packet, 0, NULL));
+ ASSERT (Value != NULL);
OpCode = NTOHS (Value);
if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) ||
@@ -522,6 +523,7 @@
// Set the requests to the listening port, other packets to the connected
port
//
Value = *(UINT16 *) NetbufGetByte (Instance->LastPacket, 0, NULL);
+ ASSERT (Value != NULL);
OpCode = NTOHS (Value);
if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) || (OpCode == EFI_MTFTP4_OPCODE_DIR) ||
Modified: trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
2012-10-31 09:33:40 UTC (rev 13902)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
2012-11-01 02:10:31 UTC (rev 13903)
@@ -710,6 +710,7 @@
Tcb = NULL;
Head = (TCP_HEAD *) NetbufGetByte (Nbuf, 0, NULL);
+ ASSERT (Head != NULL);
Len = Nbuf->TotalSize - (Head->HeadLen << 2);
if ((Head->HeadLen < 5) || (Len < 0) ||
@@ -1422,6 +1423,7 @@
BOOLEAN IcmpErrNotify;
Head = (TCP_HEAD *) NetbufGetByte (Nbuf, 0, NULL);
+ ASSERT (Head != NULL);
Tcb = TcpLocateTcb (
Head->DstPort,
Dst,
Modified: trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
2012-10-31 09:33:40 UTC (rev 13902)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
2012-11-01 02:10:31 UTC (rev 13903)
@@ -592,6 +592,7 @@
Seg = TCPSEG_NETBUF (Nbuf);
Head = (TCP_HEAD *) NetbufGetByte (Nbuf, 0, NULL);
+ ASSERT (Head != NULL);
Nbuf->Tcp = Head;
Seg->Seq = NTOHL (Head->Seq);
Modified: trunk/edk2/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
2012-10-31 09:33:40 UTC (rev 13902)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
2012-11-01 02:10:31 UTC (rev 13903)
@@ -1612,6 +1612,7 @@
// Get the datagram header from the packet buffer.
//
Udp4Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);
+ ASSERT (Udp4Header != NULL);
if (Udp4Header->Checksum != 0) {
//
@@ -1799,6 +1800,7 @@
UDP4_INSTANCE_DATA *Instance;
Udp4Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);
+ ASSERT (Udp4Header != NULL);
CopyMem (&Udp4Session.SourceAddress, &NetSession->Source, sizeof
(EFI_IPv4_ADDRESS));
CopyMem (&Udp4Session.DestinationAddress, &NetSession->Dest, sizeof
(EFI_IPv4_ADDRESS));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
