yuzu/discord-rpc
1
0
Fork 0
mirror of https://github.com/yuzu-emu/discord-rpc.git synced 2024-12-22 20:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a few more null checks.

Browse source
This commit is contained in:
Chris Marsh 2017-09-07 09:23:35 -07:00
parent fa39179be7
commit 19abe80449
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/connection_win.cpp
View file

@ -71,13 +71,22 @@ bool BaseConnection::Close()
bool BaseConnection::Write(const void* data, size_t length)
{
if (length == 0) {
return true;
}
auto self = reinterpret_cast<BaseConnectionWin*>(this);
if (self->pipe == INVALID_HANDLE_VALUE) {
return false;
}
return ::WriteFile(self->pipe, data, (DWORD)length, nullptr, nullptr) == TRUE;
}
bool BaseConnection::Read(void* data, size_t length)
{
auto self = reinterpret_cast<BaseConnectionWin*>(this);
if (self->pipe == INVALID_HANDLE_VALUE) {
return false;
}
DWORD bytesAvailable = 0;
if (::PeekNamedPipe(self->pipe, nullptr, 0, nullptr, &bytesAvailable, nullptr)) {
if (bytesAvailable >= length) {

8
src/discord-rpc.cpp
View file

@ -95,6 +95,10 @@ static void SendQueueCommitMessage()
extern "C" void Discord_UpdateConnection()
{
if (!Connection) {
return;
}
if (!Connection->IsOpen()) {
if (std::chrono::system_clock::now() >= NextConnect) {
UpdateReconnectTime();
@ -292,6 +296,10 @@ extern "C" void Discord_RunCallbacks()
// of times inbetween calls here. Externally, we want the sequence to seem sane, so any other
// signals are book-ended by calls to ready and disconnect.
if (!Connection) {
return;
}
bool wasDisconnected = WasJustDisconnected.exchange(false);
bool isConnected = Connection->IsOpen();