boostorg/algorithm
1
0
Fork 1
mirror of https://github.com/boostorg/algorithm.git synced 2025-07-01 15:00:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fox for allocation bug in is_any_ofF

Browse Source 
[SVN r48198]
This commit is contained in:
Pavol Droba
2008-08-18 18:32:51 +00:00
parent 7299b29bf8
commit baf3dd99e2
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/boost/algorithm/string/detail/classification.hpp
View File

@ -28,11 +28,7 @@ namespace boost {
// classification functors -----------------------------------------------// // classification functors -----------------------------------------------//
#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) // is_classified functor
#pragma warning(push)
#pragma warning(disable:4512) //assignment operator could not be generated
#endif
// is_classified functor
struct is_classifiedF : struct is_classifiedF :
public predicate_facade<is_classifiedF> public predicate_facade<is_classifiedF>
{ {
@ -42,7 +38,6 @@ namespace boost {
// Constructor from a locale // Constructor from a locale
is_classifiedF(std::ctype_base::mask Type, std::locale const & Loc = std::locale()) : is_classifiedF(std::ctype_base::mask Type, std::locale const & Loc = std::locale()) :
m_Type(Type), m_Locale(Loc) {} m_Type(Type), m_Locale(Loc) {}
// Operation // Operation
template<typename CharT> template<typename CharT>
bool operator()( CharT Ch ) const bool operator()( CharT Ch ) const
@ -59,13 +54,10 @@ namespace boost {
#endif #endif
private: private:
const std::ctype_base::mask m_Type; std::ctype_base::mask m_Type;
const std::locale m_Locale; std::locale m_Locale;
}; };
#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
#pragma warning(pop)
#endif
// is_any_of functor // is_any_of functor
/* /*
@ -144,7 +136,7 @@ namespace boost {
{ {
if(m_Size>FIXED_STORAGE_SIZE && m_Storage.m_dynSet!=0) if(m_Size>FIXED_STORAGE_SIZE && m_Storage.m_dynSet!=0)
{ {
delete m_Storage.m_dynSet; delete [] m_Storage.m_dynSet;
} }
} }
@ -152,23 +144,43 @@ namespace boost {
is_any_ofF& operator=(const is_any_ofF& Other) is_any_ofF& operator=(const is_any_ofF& Other)
{ {
// Prepare storage // Prepare storage
m_Storage.m_dynSet=0;
m_Size=Other.m_Size;
const set_value_type* SrcStorage=0; const set_value_type* SrcStorage=0;
set_value_type* DestStorage=0; set_value_type* DestStorage=0;
if(m_Size<=FIXED_STORAGE_SIZE) if(Other.m_Size<=FIXED_STORAGE_SIZE)
{ {
// Use fixed storage // Use fixed storage
DestStorage=&m_Storage.m_fixSet[0]; DestStorage=&m_Storage.m_fixSet[0];
SrcStorage=&Other.m_Storage.m_fixSet[0]; SrcStorage=&Other.m_Storage.m_fixSet[0];
// Delete old storage if was present
if(m_Size>FIXED_STORAGE_SIZE && m_Storage.m_dynSet!=0)
{
delete [] m_Storage.m_dynSet;
}
// Set new size
m_Size=Other.m_Size;
} }
else else
{ {
// Use dynamic storage // Use dynamic storage
m_Storage.m_dynSet=new set_value_type[m_Size];
DestStorage=m_Storage.m_dynSet; // Create new buffer
set_value_type* pTemp=new set_value_type[Other.m_Size];
DestStorage=pTemp;
SrcStorage=Other.m_Storage.m_dynSet; SrcStorage=Other.m_Storage.m_dynSet;
// Delete old storage if necessary
if(m_Size>FIXED_STORAGE_SIZE && m_Storage.m_dynSet!=0)
{
delete [] m_Storage.m_dynSet;
}
// Store the new storage
m_Storage.m_dynSet=pTemp;
// Set new size
m_Size=Other.m_Size;
} }
// Use fixed storage // Use fixed storage