github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-02-16 00:24:29 +01:00
Code Releases Activity

remove do/while(0) exception anti-pattern, fail properly on socket close

Browse Source
This commit is contained in:
Brent Cook 2017-11-06 08:04:52 -06:00
parent e117dd2326
commit b0fbc4f550
1 changed files with 127 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
c/meterpreter/source/server/win/server_transport_tcp.c
View File

@ -320,21 +320,14 @@ static DWORD packet_receive(Remote *remote, Packet **packet)
lock_acquire(remote->lock);
do
{
dprintf("[TCP PACKET RECEIVE] reading in the header");
// Read the packet length
while (inHeader)
{
if ((bytesRead = recv(ctx->fd, ((PUCHAR)&header + headerBytes), sizeof(PacketHeader)-headerBytes, 0)) <= 0)
{
if (bytesRead < 0)
{
SetLastError(ERROR_NOT_FOUND);
}
dprintf("[TCP] Socket error");
break;
goto out;
}
headerBytes += bytesRead;
@ -350,7 +343,7 @@ static DWORD packet_receive(Remote *remote, Packet **packet)
if (headerBytes != sizeof(PacketHeader))
{
dprintf("[TCP] we didn't get enough header bytes");
break;
goto out;
}
dprintf("[TCP] the XOR key is: %02x%02x%02x%02x", header.xor_key[0], header.xor_key[1], header.xor_key[2], header.xor_key[3]);
@ -394,7 +387,7 @@ static DWORD packet_receive(Remote *remote, Packet **packet)
// did something go wrong.
if (bytesToRead > 0)
{
break;
goto out;
}
// indicate success, but don't return a packet for processing
@ -424,7 +417,7 @@ static DWORD packet_receive(Remote *remote, Packet **packet)
{
dprintf("[TCP] Failed to create the packet buffer");
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
break;
goto out;
}
dprintf("[TCP] Allocated packet buffer at %p", packetBuffer);
@ -448,8 +441,7 @@ static DWORD packet_receive(Remote *remote, Packet **packet)
{
SetLastError(ERROR_NOT_FOUND);
}
break;
goto out;
}
payloadBytesLeft -= bytesRead;
@ -459,7 +451,7 @@ static DWORD packet_receive(Remote *remote, Packet **packet)
if (payloadBytesLeft)
{
dprintf("[TCP] Failed to get all the payload bytes");
break;
goto out;
}
#ifdef DEBUGTRACE
@ -492,8 +484,7 @@ static DWORD packet_receive(Remote *remote, Packet **packet)
}
}
} while (0);
out:
res = GetLastError();
dprintf("[TCP] Freeing stuff up");