nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1395246: nullcheck DataChannel SendPacket calls, add some diagnostics r=drno

Browse source
This commit is contained in:
Randell Jesup 2018-06-07 15:26:25 -04:00
parent e5398fd8f8
commit c0b25e1706
2 changed files with 17 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
netwerk/sctp/datachannel/DataChannel.cpp
View file

@ -318,6 +318,9 @@ DataChannelConnection::DataChannelConnection(DataConnectionListener *listener,
mPendingType = PENDING_NONE;
LOG(("Constructor DataChannelConnection=%p, listener=%p", this, mListener.get()));
mInternalIOThread = nullptr;
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
mShutdown = false;
#endif
}
DataChannelConnection::~DataChannelConnection()
@ -395,6 +398,9 @@ void DataChannelConnection::DestroyOnSTS(struct socket *aMasterSocket,
usrsctp_deregister_address(static_cast<void *>(this));
LOG(("Deregistered %p from the SCTP stack.", static_cast<void *>(this)));
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
mShutdown = true;
#endif
disconnect_all();
@ -831,7 +837,10 @@ int
DataChannelConnection::SendPacket(unsigned char data[], size_t len, bool release)
{
//LOG(("%p: SCTP/DTLS sent %ld bytes", this, len));
int res = mTransportFlow->SendPacket(data, len) < 0 ? 1 : 0;
int res = 0;
if (mTransportFlow) {
res = mTransportFlow->SendPacket(data, len) < 0 ? 1 : 0;
}
if (release)
delete [] data;
return res;
@ -844,6 +853,7 @@ DataChannelConnection::SctpDtlsOutput(void *addr, void *buffer, size_t length,
{
DataChannelConnection *peer = static_cast<DataChannelConnection *>(addr);
int res;
MOZ_DIAGNOSTIC_ASSERT(!peer->mShutdown);
if (MOZ_LOG_TEST(gSCTPLog, LogLevel::Debug)) {
char *buf;

8
netwerk/sctp/datachannel/DataChannel.h
View file

@ -139,8 +139,8 @@ public:
virtual void NotifyDataChannel(already_AddRefed<DataChannel> channel) = 0;
};
explicit DataChannelConnection(DataConnectionListener *listener,
nsIEventTarget *aTarget);
DataChannelConnection(DataConnectionListener *listener,
nsIEventTarget *aTarget);
bool Init(unsigned short aPort, uint16_t aNumStreams, bool aMaxMessageSizeSet,
uint64_t aMaxMessageSize);
@ -342,6 +342,10 @@ private:
nsCOMPtr<nsIThread> mInternalIOThread;
uint8_t mPendingType;
nsCString mRecvBuffer;
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
bool mShutdown;
#endif
};
#define ENSURE_DATACONNECTION \