Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Memory leakage in vector_queue fixed

Browse Source
This commit is contained in:
Simon Rozman 2016-09-13 13:01:45 +02:00
parent c6969fc2cf
commit 490f37e896
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/WinStd/Common.h
View File

@ -829,20 +829,29 @@ namespace winstd
} }
} }
///
/// Destroys the queue
///
virtual ~vector_queue()
{
if (m_data) delete [] m_data;
}
/// ///
/// Moves existing queue. /// Moves existing queue.
/// ///
/// \param[inout] other Queue to move /// \param[inout] other Queue to move
/// ///
inline vector_queue(_Inout_ vector_queue<value_type> &&other) : inline vector_queue(_Inout_ vector_queue<value_type> &&other) :
m_data(std::move(other.m_data)), m_data (std::move(other.m_data )),
m_head(std::move(other.m_head)), m_head (std::move(other.m_head )),
m_count(std::move(other.m_count)), m_count (std::move(other.m_count )),
m_size_max(std::move(other.m_size_max)) m_size_max(std::move(other.m_size_max))
{ {
// Reset other to consistent state. // Reset other to consistent state.
other.m_head = 0; other.m_data = NULL;
other.m_count = 0; other.m_head = 0;
other.m_count = 0;
other.m_size_max = 0; other.m_size_max = 0;
} }
@ -859,7 +868,8 @@ namespace winstd
m_size_max = other.m_size_max; m_size_max = other.m_size_max;
// Copy elements. // Copy elements.
m_data.reset(new value_type[other.m_size_max]); if (m_data) delete [] m_data;
m_data = new value_type[other.m_size_max];
for (size_type i = 0; i < m_count; i++) { for (size_type i = 0; i < m_count; i++) {
size_type i_l = abs(i); size_type i_l = abs(i);
m_data[i_l] = other.m_data[i_l]; m_data[i_l] = other.m_data[i_l];
@ -883,8 +893,9 @@ namespace winstd
m_size_max = std::move(other.m_size_max); m_size_max = std::move(other.m_size_max);
// Reset other to consistent state. // Reset other to consistent state.
other.m_head = 0; other.m_data = NULL;
other.m_count = 0; other.m_head = 0;
other.m_count = 0;
other.m_size_max = 0; other.m_size_max = 0;
} }
@ -1147,10 +1158,10 @@ namespace winstd
} }
protected: protected:
std::unique_ptr<value_type[]> m_data; ///< Underlying data container value_type *m_data; ///< Underlying data container
size_type m_head; ///< Index of the first element size_type m_head; ///< Index of the first element
size_type m_count; ///< Number of elements size_type m_count; ///< Number of elements
size_type m_size_max; ///< Maximum size size_type m_size_max; ///< Maximum size
}; };