i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot_net: Fix TCP memory leaks

Browse Source 
In some error conditions the packet would have been leaked.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38503 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Andreas Färber
2010-09-01 18:19:57 +00:00
parent 65e71a6e02
commit 3bc0fcc66e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/net/TCP.cpp
+13 -4
View File
@@ -218,8 +218,10 @@ TCPSocket::Connect(ip_addr_t address, uint16 port)
return B_NO_MEMORY; return B_NO_MEMORY;
error = packet->SetTo(NULL, 0, fAddress, fPort, address, port, error = packet->SetTo(NULL, 0, fAddress, fPort, address, port,
fSequenceNumber, fAcknowledgeNumber, TCP_SYN); fSequenceNumber, fAcknowledgeNumber, TCP_SYN);
if (error != B_OK) if (error != B_OK) {
delete packet;
return error; return error;
}
error = _Send(packet); error = _Send(packet);
if (error != B_OK) if (error != B_OK)
return error; return error;
@@ -248,8 +250,10 @@ TCPSocket::Close()
return B_NO_MEMORY; return B_NO_MEMORY;
status_t error = packet->SetTo(NULL, 0, fAddress, fPort, fRemoteAddress, status_t error = packet->SetTo(NULL, 0, fAddress, fPort, fRemoteAddress,
fRemotePort, fSequenceNumber, fAcknowledgeNumber, TCP_FIN | TCP_ACK); fRemotePort, fSequenceNumber, fAcknowledgeNumber, TCP_FIN | TCP_ACK);
if (error != B_OK) if (error != B_OK) {
delete packet;
return error; return error;
}
error = _Send(packet); error = _Send(packet);
if (error != B_OK) if (error != B_OK)
return error; return error;
@@ -354,8 +358,10 @@ TCPSocket::Write(const void* buffer, size_t bufferSize)
status_t error = packet->SetTo(buffer, bufferSize, fAddress, fPort, status_t error = packet->SetTo(buffer, bufferSize, fAddress, fPort,
fRemoteAddress, fRemotePort, fSequenceNumber, fAcknowledgeNumber, fRemoteAddress, fRemotePort, fSequenceNumber, fAcknowledgeNumber,
TCP_ACK); TCP_ACK);
if (error != B_OK) if (error != B_OK) {
delete packet;
return error; return error;
}
return _Send(packet); return _Send(packet);
} }
@@ -589,9 +595,12 @@ TCPSocket::_Ack()
return B_NO_MEMORY; return B_NO_MEMORY;
status_t error = packet->SetTo(NULL, 0, fAddress, fPort, fRemoteAddress, status_t error = packet->SetTo(NULL, 0, fAddress, fPort, fRemoteAddress,
fRemotePort, fSequenceNumber, fAcknowledgeNumber, TCP_ACK); fRemotePort, fSequenceNumber, fAcknowledgeNumber, TCP_ACK);
if (error != B_OK) if (error != B_OK) {
delete packet;
return error; return error;
}
error = _Send(packet, false); error = _Send(packet, false);
delete packet;
if (error != B_OK) if (error != B_OK)
return error; return error;
return B_OK; return B_OK;