jessequ
/
qamqp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use stack instead of broken usage of QByteBuffer 

The internal buffer should not be used blindly when reading
Frame::HEADER_SIZE, as it is error prone and adds nothing over reading
on the stack (and it's only 7 bytes). There are places in this class
where buffer.clear() is called.
This commit is contained in:
Adam Majer 2014-09-12 11:05:15 -05:00 committed by Matt Broadstone
parent 4bfef5f81f
commit 7ff0dfab1b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qamqpclient.cpp
View File

@ -31,7 +31,6 @@ ClientPrivate::ClientPrivate(Client *q)
error(QAMQP::NoError), error(QAMQP::NoError),
q_ptr(q) q_ptr(q)
{ {
buffer.reserve(Frame::HEADER_SIZE);
} }
ClientPrivate::~ClientPrivate() ClientPrivate::~ClientPrivate()
@ -190,8 +189,10 @@ void ClientPrivate::_q_socketError(QAbstractSocket::SocketError error)
void ClientPrivate::_q_readyRead() void ClientPrivate::_q_readyRead()
{ {
while (socket->bytesAvailable() >= Frame::HEADER_SIZE) { while (socket->bytesAvailable() >= Frame::HEADER_SIZE) {
char *headerData = buffer.data(); char headerData[Frame::HEADER_SIZE];
socket->peek(headerData, Frame::HEADER_SIZE); socket->peek(headerData, Frame::HEADER_SIZE);
// FIXME: This is not the correct way of reading payloadSize
// gcc: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
const quint32 payloadSize = qFromBigEndian<quint32>(*(quint32*)&headerData[3]); const quint32 payloadSize = qFromBigEndian<quint32>(*(quint32*)&headerData[3]);
const qint64 readSize = Frame::HEADER_SIZE + payloadSize + Frame::FRAME_END_SIZE; const qint64 readSize = Frame::HEADER_SIZE + payloadSize + Frame::FRAME_END_SIZE;