frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: multiple memory leaks and segfault issues in Flatbuffer Forwarder. (#709)

Browse Source
This commit is contained in:
Scott Porter
2020-03-01 06:37:06 -08:00
committed by GitHub
parent 8db85c9a5a
commit 11a6ff43ae
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsrc/flatbufserver/FlatBufferClient.cpp
View File

@@ -44,7 +44,7 @@ void FlatBufferClient::readyRead()
if((uint32_t) _receiveBuffer.size() < messageSize + 4) return;
// extract message only and remove header + msg from buffer :: QByteArray::remove() does not return the removed data
const QByteArray msg = _receiveBuffer.right(messageSize);
const QByteArray msg = _receiveBuffer.mid(4, messageSize);
_receiveBuffer.remove(0, messageSize + 4);
const auto* msgData = reinterpret_cast<const uint8_t*>(msg.constData());
@@ -113,6 +113,8 @@ void FlatBufferClient::registationRequired(const int priority)
// send reply
sendMessage();
_builder.Clear();
}
}
@@ -133,6 +135,8 @@ void FlatBufferClient::handleRegisterCommand(const hyperionnet::Register *regReq
// send reply
sendMessage();
_builder.Clear();
}
void FlatBufferClient::handleImageCommand(const hyperionnet::Image *image)
@@ -192,7 +196,6 @@ void FlatBufferClient::sendMessage()
_socket->write((const char *) sizeData, sizeof(sizeData));
_socket->write((const char *)buffer, size);
_socket->flush();
_builder.Clear();
}
void FlatBufferClient::sendSuccessReply()
@@ -202,6 +205,8 @@ void FlatBufferClient::sendSuccessReply()
// send reply
sendMessage();
_builder.Clear();
}
void FlatBufferClient::sendErrorReply(const std::string &error)
@@ -212,4 +217,6 @@ void FlatBufferClient::sendErrorReply(const std::string &error)
// send reply
sendMessage();
_builder.Clear();
}

6
libsrc/flatbufserver/FlatBufferConnection.cpp
View File

@@ -66,7 +66,7 @@ void FlatBufferConnection::readData()
if((uint32_t) _receiveBuffer.size() < messageSize + 4) return;
// extract message only and remove header + msg from buffer :: QByteArray::remove() does not return the removed data
const QByteArray msg = _receiveBuffer.right(messageSize);
const QByteArray msg = _receiveBuffer.mid(4, messageSize);
_receiveBuffer.remove(0, messageSize + 4);
const uint8_t* msgData = reinterpret_cast<const uint8_t*>(msg.constData());
@@ -117,6 +117,7 @@ void FlatBufferConnection::setColor(const ColorRgb & color, int priority, int du
_builder.Finish(req);
sendMessage(_builder.GetBufferPointer(), _builder.GetSize());
_builder.Clear();
}
void FlatBufferConnection::setImage(const Image<ColorRgb> &image)
@@ -128,6 +129,7 @@ void FlatBufferConnection::setImage(const Image<ColorRgb> &image)
_builder.Finish(req);
sendMessage(_builder.GetBufferPointer(), _builder.GetSize());
_builder.Clear();
}
void FlatBufferConnection::clear(int priority)
@@ -137,6 +139,7 @@ void FlatBufferConnection::clear(int priority)
_builder.Finish(req);
sendMessage(_builder.GetBufferPointer(), _builder.GetSize());
_builder.Clear();
}
void FlatBufferConnection::clearAll()
@@ -193,7 +196,6 @@ void FlatBufferConnection::sendMessage(const uint8_t* buffer, uint32_t size)
count += _socket.write(reinterpret_cast<const char *>(header), 4);
count += _socket.write(reinterpret_cast<const char *>(buffer), size);
_socket.flush();
_builder.Clear();
}
bool FlatBufferConnection::parseReply(const hyperionnet::Reply *reply)