lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-03 09:51:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[TRACERT] Fix undefined behavior by fixing ReplyBuffer size. (#2422)

Browse Source 
CORE-16620
This commit is contained in:
Erdem Ersoy
2020-03-08 21:36:07 +03:00
committed by GitHub
parent 29c1089983
commit 0ddf0a06c3
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
base/applications/network/tracert/tracert.cpp
View File

@@ -377,31 +377,31 @@ RunTraceRoute()
}
BYTE SendBuffer[PACKET_SIZE];
ICMPV6_ECHO_REPLY ReplyBufferv6;
#ifdef _WIN64
ICMP_ECHO_REPLY32 ReplyBufferv432;
#else
ICMP_ECHO_REPLY ReplyBufferv4;
#endif
PVOID ReplyBuffer;
DWORD ReplySize = PACKET_SIZE + SIZEOF_ICMP_ERROR + SIZEOF_IO_STATUS_BLOCK;
if (Info.Family == AF_INET6)
{
ReplyBuffer = &ReplyBufferv6;
ReplySize += sizeof(ICMPV6_ECHO_REPLY);
}
else
{
#ifdef _WIN64
ReplyBuffer = &ReplyBufferv432;
ReplySize += sizeof(ICMP_ECHO_REPLY32);
#else
ReplyBuffer = &ReplyBufferv4;
ReplySize += sizeof(ICMP_ECHO_REPLY);
#endif
}
HANDLE heap = GetProcessHeap();
ReplyBuffer = HeapAlloc(heap, HEAP_ZERO_MEMORY, ReplySize);
if (ReplyBuffer == NULL)
{
FreeAddrInfoW(Info.Target);
return false;
}
if (Info.Family == AF_INET6)
{
Info.hIcmpFile = Icmp6CreateFile();
@@ -412,6 +412,7 @@ RunTraceRoute()
}
if (Info.hIcmpFile == INVALID_HANDLE_VALUE)
{
HeapFree(heap, 0, ReplyBuffer);
FreeAddrInfoW(Info.Target);
return false;
}
@@ -486,6 +487,7 @@ RunTraceRoute()
OutputText(IDS_TRACE_COMPLETE);
HeapFree(heap, 0, ReplyBuffer);
FreeAddrInfoW(Info.Target);
if (Info.hIcmpFile)
{