up to 2.8.0

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index e7ab5d2615212a8d975284cec81b404a260d9f9f..2a989467876a4c82b3dfe172459a1165019b5ae3 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -35,7 +35,11 @@
 #endif
 
 #include <ctype.h>
 #endif
 
 #include <ctype.h>

-#include <errno.h>
+
+#ifndef __WXWINCE__
+    #include <errno.h>
+#endif
+

 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>
 


@@ -1073,16 +1077,21 @@ wxChar *wxString::GetWriteBuf(size_t nLen)
 // put string back in a reasonable state after GetWriteBuf
 void wxString::UngetWriteBuf()
 {
 // put string back in a reasonable state after GetWriteBuf
 void wxString::UngetWriteBuf()
 {

-  GetStringData()->nDataLength = wxStrlen(m_pchData);
-  GetStringData()->Validate(true);
+  UngetWriteBuf(wxStrlen(m_pchData));

 }
 
 void wxString::UngetWriteBuf(size_t nLen)
 {
 }
 
 void wxString::UngetWriteBuf(size_t nLen)
 {

-  GetStringData()->nDataLength = nLen;
-  GetStringData()->Validate(true);
+  wxStringData * const pData = GetStringData();
+
+  wxASSERT_MSG( nLen < pData->nAllocLength, _T("buffer overrun") );
+
+  // the strings we store are always NUL-terminated
+  pData->data()[nLen] = _T('\0');
+  pData->nDataLength = nLen;
+  pData->Validate(true);

 }
 }

-#endif
+#endif // !wxUSE_STL

 
 // ---------------------------------------------------------------------------
 // data access
 
 // ---------------------------------------------------------------------------
 // data access


@@ -1604,7 +1613,7 @@ wxString& wxString::Trim(bool bFromRight)
             reverse_iterator psz = rbegin();
             while ( (psz != rend()) && wxSafeIsspace(*psz) )
                 psz++;
             reverse_iterator psz = rbegin();
             while ( (psz != rend()) && wxSafeIsspace(*psz) )
                 psz++;

-            
+

             // truncate at trailing space start
             erase(psz.base(), end());
         }
             // truncate at trailing space start
             erase(psz.base(), end());
         }


@@ -1677,23 +1686,30 @@ int wxString::Find(const wxChar *pszSub) const
 
 // the implementation of all the functions below is exactly the same so factor
 // it out
 
 // the implementation of all the functions below is exactly the same so factor
 // it out

-template <typename T>
+
+template <typename T, typename F>

 bool wxStringToIntType(const wxChar *start,
                        T *val,
                        int base,
 bool wxStringToIntType(const wxChar *start,
                        T *val,
                        int base,

-                       T (*func)(const wxChar *, wxChar **, int))
+                       F func)

 {
     wxCHECK_MSG( val, false, _T("NULL output pointer") );
     wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
 
 {
     wxCHECK_MSG( val, false, _T("NULL output pointer") );
     wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
 

+#ifndef __WXWINCE__

     errno = 0;
     errno = 0;

+#endif

 
     wxChar *end;
     *val = (*func)(start, &end, base);
 
     // return true only if scan was stopped by the terminating NUL and if the
     // string was not empty to start with and no under/overflow occurred
 
     wxChar *end;
     *val = (*func)(start, &end, base);
 
     // return true only if scan was stopped by the terminating NUL and if the
     // string was not empty to start with and no under/overflow occurred

-    return !*end && (end != start) && (errno != ERANGE);
+    return !*end && (end != start)
+#ifndef __WXWINCE__
+        && (errno != ERANGE)
+#endif
+    ;

 }
 
 bool wxString::ToLong(long *val, int base) const
 }
 
 bool wxString::ToLong(long *val, int base) const


@@ -1712,6 +1728,8 @@ bool wxString::ToLongLong(wxLongLong_t *val, int base) const
     return wxStringToIntType(c_str(), val, base, wxStrtoll);
 #else
     // TODO: implement this ourselves
     return wxStringToIntType(c_str(), val, base, wxStrtoll);
 #else
     // TODO: implement this ourselves

+    wxUnusedVar(val);
+    wxUnusedVar(base);

     return false;
 #endif // wxHAS_STRTOLL
 }
     return false;
 #endif // wxHAS_STRTOLL
 }


@@ -1722,6 +1740,8 @@ bool wxString::ToULongLong(wxULongLong_t *val, int base) const
     return wxStringToIntType(c_str(), val, base, wxStrtoull);
 #else
     // TODO: implement this ourselves
     return wxStringToIntType(c_str(), val, base, wxStrtoull);
 #else
     // TODO: implement this ourselves

+    wxUnusedVar(val);
+    wxUnusedVar(base);

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -1730,7 +1750,9 @@ bool wxString::ToDouble(double *val) const
 {
     wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );
 
 {
     wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );
 

+#ifndef __WXWINCE__

     errno = 0;
     errno = 0;

+#endif

 
     const wxChar *start = c_str();
     wxChar *end;
 
     const wxChar *start = c_str();
     wxChar *end;


@@ -1738,7 +1760,11 @@ bool wxString::ToDouble(double *val) const
 
     // return true only if scan was stopped by the terminating NUL and if the
     // string was not empty to start with and no under/overflow occurred
 
     // return true only if scan was stopped by the terminating NUL and if the
     // string was not empty to start with and no under/overflow occurred

-    return !*end && (end != start) && (errno != ERANGE);
+    return !*end && (end != start)
+#ifndef __WXWINCE__
+        && (errno != ERANGE)
+#endif
+    ;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1815,9 +1841,11 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
             // current size of the buffer
             size *= 2;
         }
             // current size of the buffer
             size *= 2;
         }

-        else if ( len > size )
+        else if ( len >= size )

         {
         {

-            size = len;
+            // some vsnprintf() implementations NUL-terminate the buffer and
+            // some don't in len == size case, to be safe always add 1
+            size = len + 1;

         }
         else // ok, there was enough space
         {
         }
         else // ok, there was enough space
         {


@@ -2162,13 +2190,16 @@ void wxArrayString::Alloc(size_t nSize)
 {
   // only if old buffer was not big enough
   if ( nSize > m_nSize ) {
 {
   // only if old buffer was not big enough
   if ( nSize > m_nSize ) {

-    Free();
-    wxDELETEA(m_pItems);
-    m_pItems = new wxChar *[nSize];
+    wxChar **pNew = new wxChar *[nSize];
+    if ( !pNew )
+        return;
+
+    memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
+    delete [] m_pItems;
+
+    m_pItems = pNew;

     m_nSize  = nSize;
   }
     m_nSize  = nSize;
   }

-
-  m_nCount = 0;

 }
 
 // minimizes the memory usage by freeing unused memory
 }
 
 // minimizes the memory usage by freeing unused memory