From 668a60a5339b3078540c6cabfa199271c8d816a4 Mon Sep 17 00:00:00 2001 From: Zofia Abramowska Date: Fri, 21 Nov 2014 15:43:28 +0100 Subject: [PATCH] Fix uninitialized member Descriptor could return uninitialized BinaryQueuePtr. Change-Id: I53fbc739438e8316ca5c4b81eec5139b6732aea2 --- src/service/sockets/Descriptor.cpp | 5 +++++ src/service/sockets/Descriptor.h | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/service/sockets/Descriptor.cpp b/src/service/sockets/Descriptor.cpp index b2e9459..e247f7f 100644 --- a/src/service/sockets/Descriptor.cpp +++ b/src/service/sockets/Descriptor.cpp @@ -34,6 +34,11 @@ void Descriptor::checkQueues(void) { m_readQueue = std::make_shared(); } +BinaryQueuePtr Descriptor::writeQueue(void) { + checkQueues(); + return m_writeQueue; +} + bool Descriptor::hasDataToWrite(void) const { if (m_writeQueue) return !(m_writeQueue->empty() && m_writeBuffer.empty()); diff --git a/src/service/sockets/Descriptor.h b/src/service/sockets/Descriptor.h index 5d77028..a9a6c68 100644 --- a/src/service/sockets/Descriptor.h +++ b/src/service/sockets/Descriptor.h @@ -57,9 +57,7 @@ public: ResponseTakerPtr responseTaker(void) const; - BinaryQueuePtr writeQueue(void) { - return m_writeQueue; - } + BinaryQueuePtr writeQueue(void); void setProtocol(ProtocolPtr protocol) { m_protocol = protocol; -- 2.7.4