Init();
if ( nLength > 0 ) {
- AllocBuffer(nLength);
+ if ( !AllocBuffer(nLength) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::wxString") );
+ return;
+ }
#if wxUSE_UNICODE
// memset only works on char
if ( nLength > 0 ) {
// trailing '\0' is written in AllocBuffer()
- AllocBuffer(nLength);
+ if ( !AllocBuffer(nLength) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::InitWith") );
+ return;
+ }
memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar));
}
}
// empty?
if ( (nLen != 0) && (nLen != (size_t)-1) ) {
- AllocBuffer(nLen);
+ if ( !AllocBuffer(nLen) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::wxString") );
+ return;
+ }
conv.MB2WC(m_pchData, psz, nLen);
}
else {
// empty?
if ( (nLen != 0) && (nLen != (size_t)-1) ) {
- AllocBuffer(nLen);
+ if ( !AllocBuffer(nLen) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::wxString") );
+ return;
+ }
conv.WC2MB(m_pchData, pwz, nLen);
}
else {
// ---------------------------------------------------------------------------
// allocates memory needed to store a C string of length nLen
-void wxString::AllocBuffer(size_t nLen)
+bool wxString::AllocBuffer(size_t nLen)
{
// allocating 0 sized buffer doesn't make sense, all empty strings should
// reuse g_strEmpty
// 2) sizeof(wxStringData) for housekeeping info
wxStringData* pData = (wxStringData*)
malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(wxChar));
+
+ if ( pData == NULL ) {
+ // allocation failures are handled by the caller
+ return FALSE;
+ }
+
pData->nRefs = 1;
pData->nDataLength = nLen;
pData->nAllocLength = nLen + EXTRA_ALLOC;
m_pchData = pData->data(); // data starts after wxStringData
m_pchData[nLen] = wxT('\0');
+ return TRUE;
}
// must be called before changing this string
-void wxString::CopyBeforeWrite()
+bool wxString::CopyBeforeWrite()
{
wxStringData* pData = GetStringData();
if ( pData->IsShared() ) {
pData->Unlock(); // memory not freed because shared
size_t nLen = pData->nDataLength;
- AllocBuffer(nLen);
+ if ( !AllocBuffer(nLen) ) {
+ // allocation failures are handled by the caller
+ return FALSE;
+ }
memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar));
}
wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner
+
+ return TRUE;
}
// must be called before replacing contents of this string
-void wxString::AllocBeforeWrite(size_t nLen)
+bool wxString::AllocBeforeWrite(size_t nLen)
{
wxASSERT( nLen != 0 ); // doesn't make any sense
if ( pData->IsShared() || pData->IsEmpty() ) {
// can't work with old buffer, get new one
pData->Unlock();
- AllocBuffer(nLen);
+ if ( !AllocBuffer(nLen) ) {
+ // allocation failures are handled by the caller
+ return FALSE;
+ }
}
else {
if ( nLen > pData->nAllocLength ) {
nLen += EXTRA_ALLOC;
- wxStringData *pDataOld = pData;
pData = (wxStringData*)
realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
- if ( !pData ) {
- // out of memory
- free(pDataOld);
-
- // FIXME we're going to crash...
- return;
+
+ if ( pData == NULL ) {
+ // allocation failures are handled by the caller
+ // keep previous data since reallocation failed
+ return FALSE;
}
pData->nAllocLength = nLen;
}
wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner
+
+ return TRUE;
}
// allocate enough memory for nLen characters
-void wxString::Alloc(size_t nLen)
+bool wxString::Alloc(size_t nLen)
{
wxStringData *pData = GetStringData();
if ( pData->nAllocLength <= nLen ) {
nLen += EXTRA_ALLOC;
wxStringData* pData = (wxStringData*)
- malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
+ malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
+
+ if ( pData == NULL ) {
+ // allocation failure handled by caller
+ return FALSE;
+ }
+
pData->nRefs = 1;
pData->nDataLength = 0;
pData->nAllocLength = nLen;
else if ( pData->IsShared() ) {
pData->Unlock(); // memory not freed because shared
size_t nOldLen = pData->nDataLength;
- AllocBuffer(nLen);
+ if ( !AllocBuffer(nLen) ) {
+ // allocation failure handled by caller
+ return FALSE;
+ }
memcpy(m_pchData, pData->data(), nOldLen*sizeof(wxChar));
}
else {
nLen += EXTRA_ALLOC;
- wxStringData *pDataOld = pData;
- wxStringData *p = (wxStringData *)
+ pData = (wxStringData *)
realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
- if ( p == NULL ) {
- // don't leak memory
- free(pDataOld);
-
- // FIXME what to do on memory error?
- return;
+ if ( pData == NULL ) {
+ // allocation failure handled by caller
+ // keep previous data since reallocation failed
+ return FALSE;
}
// it's not important if the pointer changed or not (the check for this
// is not faster than assigning to m_pchData in all cases)
- p->nAllocLength = nLen;
- m_pchData = p->data();
+ pData->nAllocLength = nLen;
+ m_pchData = pData->data();
}
}
//else: we've already got enough
+ return TRUE;
}
// shrink to minimal size (releasing extra memory)
-void wxString::Shrink()
+bool wxString::Shrink()
{
wxStringData *pData = GetStringData();
size_t nLen = pData->nDataLength;
void *p = realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
- wxASSERT_MSG( p != NULL, _T("can't free memory?") );
+ if ( p == NULL) {
+ wxFAIL_MSG( _T("out of memory reallocating wxString data") );
+ // keep previous data since reallocation failed
+ return FALSE;
+ }
if ( p != pData )
{
}
pData->nAllocLength = nLen;
+
+ return TRUE;
}
// get the pointer to writable buffer of (at least) nLen bytes
wxChar *wxString::GetWriteBuf(size_t nLen)
{
- AllocBeforeWrite(nLen);
+ if ( !AllocBeforeWrite(nLen) ) {
+ // allocation failure handled by caller
+ return NULL;
+ }
wxASSERT( GetStringData()->nRefs == 1 );
GetStringData()->Validate(FALSE);
// ---------------------------------------------------------------------------
// helper function: does real copy
-void wxString::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData)
+bool wxString::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData)
{
if ( nSrcLen == 0 ) {
Reinit();
}
else {
- AllocBeforeWrite(nSrcLen);
+ if ( !AllocBeforeWrite(nSrcLen) ) {
+ // allocation failure handled by caller
+ return FALSE;
+ }
memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxChar));
GetStringData()->nDataLength = nSrcLen;
m_pchData[nSrcLen] = wxT('\0');
}
+ return TRUE;
}
// assigns one string to another
// assigns a single character
wxString& wxString::operator=(wxChar ch)
{
- AssignCopy(1, &ch);
+ if ( !AssignCopy(1, &ch) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::operator=(wxChar)") );
+ }
return *this;
}
// assigns C string
wxString& wxString::operator=(const wxChar *psz)
{
- AssignCopy(wxStrlen(psz), psz);
+ if ( !AssignCopy(wxStrlen(psz), psz) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::operator=(const wxChar *)") );
+ }
return *this;
}
// ---------------------------------------------------------------------------
// add something to this string
-void wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData)
+bool wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData)
{
STATISTICS_ADD(SummandLength, nSrcLen);
// we have to allocate another buffer
wxStringData* pOldData = GetStringData();
- AllocBuffer(nNewLen);
+ if ( !AllocBuffer(nNewLen) ) {
+ // allocation failure handled by caller
+ return FALSE;
+ }
memcpy(m_pchData, pOldData->data(), nLen*sizeof(wxChar));
pOldData->Unlock();
}
STATISTICS_ADD(ConcatHit, 0);
// we have to grow the buffer
- Alloc(nNewLen);
+ if ( !Alloc(nNewLen) ) {
+ // allocation failure handled by caller
+ return FALSE;
+ }
}
else {
STATISTICS_ADD(ConcatHit, 1);
GetStringData()->nDataLength = nNewLen; // and fix the length
}
//else: the string to append was empty
+ return TRUE;
}
/*
* C str + string and string + C str
*/
-wxString operator+(const wxString& string1, const wxString& string2)
+wxString operator+(const wxString& str1, const wxString& str2)
{
- wxASSERT( string1.GetStringData()->IsValid() );
- wxASSERT( string2.GetStringData()->IsValid() );
+ wxASSERT( str1.GetStringData()->IsValid() );
+ wxASSERT( str2.GetStringData()->IsValid() );
- wxString s = string1;
- s += string2;
+ wxString s = str1;
+ s += str2;
return s;
}
-wxString operator+(const wxString& string, wxChar ch)
+wxString operator+(const wxString& str, wxChar ch)
{
- wxASSERT( string.GetStringData()->IsValid() );
+ wxASSERT( str.GetStringData()->IsValid() );
- wxString s = string;
+ wxString s = str;
s += ch;
return s;
}
-wxString operator+(wxChar ch, const wxString& string)
+wxString operator+(wxChar ch, const wxString& str)
{
- wxASSERT( string.GetStringData()->IsValid() );
+ wxASSERT( str.GetStringData()->IsValid() );
wxString s = ch;
- s += string;
+ s += str;
return s;
}
-wxString operator+(const wxString& string, const wxChar *psz)
+wxString operator+(const wxString& str, const wxChar *psz)
{
- wxASSERT( string.GetStringData()->IsValid() );
+ wxASSERT( str.GetStringData()->IsValid() );
wxString s;
- s.Alloc(wxStrlen(psz) + string.Len());
- s = string;
+ if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::operator+") );
+ }
+ s = str;
s += psz;
return s;
}
-wxString operator+(const wxChar *psz, const wxString& string)
+wxString operator+(const wxChar *psz, const wxString& str)
{
- wxASSERT( string.GetStringData()->IsValid() );
+ wxASSERT( str.GetStringData()->IsValid() );
wxString s;
- s.Alloc(wxStrlen(psz) + string.Len());
+ if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::operator+") );
+ }
s = psz;
- s += string;
+ s += str;
return s;
}
// ---------------------------------------------------------------------------
// helper function: clone the data attached to this string
-void wxString::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const
+bool wxString::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const
{
if ( nCopyLen == 0 ) {
dest.Init();
}
else {
- dest.AllocBuffer(nCopyLen);
+ if ( !dest.AllocBuffer(nCopyLen) ) {
+ // allocation failure handled by caller
+ return FALSE;
+ }
memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(wxChar));
}
+ return TRUE;
}
// extract string of length nCount starting at nFirst
}
wxString dest;
- AllocCopy(dest, nCount, nFirst);
+ if ( !AllocCopy(dest, nCount, nFirst) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::Mid") );
+ }
return dest;
}
nCount = GetStringData()->nDataLength;
wxString dest;
- AllocCopy(dest, nCount, GetStringData()->nDataLength - nCount);
+ if ( !AllocCopy(dest, nCount, GetStringData()->nDataLength - nCount) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::Right") );
+ }
return dest;
}
nCount = GetStringData()->nDataLength;
wxString dest;
- AllocCopy(dest, nCount, 0);
+ if ( !AllocCopy(dest, nCount, 0) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::Left") );
+ }
return dest;
}
}
else {
// take chars before match
- strTemp.ConcatSelf(pSubstr - pCurrent, pCurrent);
+ if ( !strTemp.ConcatSelf(pSubstr - pCurrent, pCurrent) ) {
+ wxFAIL_MSG( _T("out of memory in wxString::Replace") );
+ return 0;
+ }
strTemp += szNew;
pCurrent = pSubstr + uiOldLen; // restart after match
wxString& wxString::MakeUpper()
{
- CopyBeforeWrite();
-
+ if ( !CopyBeforeWrite() ) {
+ wxFAIL_MSG( _T("out of memory in wxString::MakeUpper") );
+ return *this;
+ }
+
for ( wxChar *p = m_pchData; *p; p++ )
*p = (wxChar)wxToupper(*p);
wxString& wxString::MakeLower()
{
- CopyBeforeWrite();
+ if ( !CopyBeforeWrite() ) {
+ wxFAIL_MSG( _T("out of memory in wxString::MakeLower") );
+ return *this;
+ }
for ( wxChar *p = m_pchData; *p; p++ )
*p = (wxChar)wxTolower(*p);
)
{
// ok, there is at least one space to trim
- CopyBeforeWrite();
+ if ( !CopyBeforeWrite() ) {
+ wxFAIL_MSG( _T("out of memory in wxString::Trim") );
+ return *this;
+ }
if ( bFromRight )
{
wxString& wxString::Truncate(size_t uiLen)
{
if ( uiLen < Len() ) {
- CopyBeforeWrite();
+ if ( !CopyBeforeWrite() ) {
+ wxFAIL_MSG( _T("out of memory in wxString::Truncate") );
+ return *this;
+ }
*(m_pchData + uiLen) = wxT('\0');
GetStringData()->nDataLength = uiLen;
projects / wxWidgets.git / blobdiff