From 6efe91069982cf1c3c2de716a366ffe5494d653f Mon Sep 17 00:00:00 2001 From: Federico Montesino Pouzols Date: Tue, 26 May 2015 10:27:10 +0100 Subject: [PATCH] fix uninit coverity issues in ADARA, 1075353-1075356, re #11829 --- .../LiveData/src/ADARA/ADARAPackets.cpp | 17 +++++++++++++---- .../LiveData/src/ADARA/ADARAParser.cpp | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Code/Mantid/Framework/LiveData/src/ADARA/ADARAPackets.cpp b/Code/Mantid/Framework/LiveData/src/ADARA/ADARAPackets.cpp index 9f077cf581cd..fbf5a1af1a7e 100644 --- a/Code/Mantid/Framework/LiveData/src/ADARA/ADARAPackets.cpp +++ b/Code/Mantid/Framework/LiveData/src/ADARA/ADARAPackets.cpp @@ -109,7 +109,11 @@ SourceListPkt::SourceListPkt(const SourceListPkt &pkt) : Packet(pkt) {} /* ------------------------------------------------------------------------ */ BankedEventPkt::BankedEventPkt(const uint8_t *data, uint32_t len) - : Packet(data, len), m_fields((const uint32_t *)payload()) { + : Packet(data, len), m_fields((const uint32_t *)payload()), m_curEvent(NULL), + m_lastFieldIndex(0), m_curFieldIndex(0), m_sourceStartIndex(0), m_bankCount(0), + m_TOFOffset(0), m_isCorrected(false), m_bankNum(0), m_bankStartIndex(0), + m_bankId(0), m_eventCount(0) +{ if (m_payload_len < (4 * sizeof(uint32_t))) throw invalid_packet("BankedEvent packet is too short"); @@ -117,8 +121,13 @@ BankedEventPkt::BankedEventPkt(const uint8_t *data, uint32_t len) } BankedEventPkt::BankedEventPkt(const BankedEventPkt &pkt) - : Packet(pkt), m_fields((const uint32_t *)payload()), - m_lastFieldIndex((payload_length() / 4) - 1) {} + : Packet(pkt), m_fields((const uint32_t *)payload()), m_curEvent(NULL), + m_lastFieldIndex(0), m_curFieldIndex(0), m_sourceStartIndex(0), + m_bankCount(0), m_TOFOffset(0), m_isCorrected(false), m_bankNum(0), + m_bankStartIndex(0), m_bankId(0), m_eventCount(0) +{ + m_lastFieldIndex = ((payload_length() / 4) - 1); +} // The fact that events are wrapped up in banks which are wrapped up in source // sections is abstracted away (with the exception of checking the COR flag and @@ -361,7 +370,7 @@ TransCompletePkt::TransCompletePkt(const uint8_t *data, uint32_t len) } TransCompletePkt::TransCompletePkt(const TransCompletePkt &pkt) - : Packet(pkt), m_reason(pkt.m_reason) {} + : Packet(pkt), m_status(VariableStatus::NOT_REPORTED), m_reason(pkt.m_reason) {} /* ------------------------------------------------------------------------ */ diff --git a/Code/Mantid/Framework/LiveData/src/ADARA/ADARAParser.cpp b/Code/Mantid/Framework/LiveData/src/ADARA/ADARAParser.cpp index b2c83e04c71d..9c5232b16162 100644 --- a/Code/Mantid/Framework/LiveData/src/ADARA/ADARAParser.cpp +++ b/Code/Mantid/Framework/LiveData/src/ADARA/ADARAParser.cpp @@ -8,7 +8,7 @@ using namespace ADARA; Parser::Parser(unsigned int initial_buffer_size, unsigned int max_pkt_size) : m_size(initial_buffer_size), m_max_size(max_pkt_size), m_len(0), - m_restart_offset(0), m_oversize_len(0) { + m_restart_offset(0), m_oversize_len(0), m_oversize_offset(0) { m_buffer = new uint8_t[initial_buffer_size]; }