X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/619dcb095efac5a79b6bd1e7c65d62d651ef48fc..0d203f875d421cb42ee07a2c2bc59186877ef15b:/src/common/string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 62d81aab29..8f20b9ac13 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1686,6 +1686,8 @@ bool wxStringToIntType(const wxChar *start,
     wxCHECK_MSG( val, false, _T("NULL output pointer") );
     wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
 
+    errno = 0;
+
     wxChar *end;
     *val = (*func)(start, &end, base);
 
@@ -1704,10 +1706,32 @@ bool wxString::ToULong(unsigned long *val, int base) const
     return wxStringToIntType(c_str(), val, base, wxStrtoul);
 }
 
+bool wxString::ToLongLong(wxLongLong_t *val, int base) const
+{
+#ifdef wxHAS_STRTOLL
+    return wxStringToIntType(c_str(), val, base, wxStrtoll);
+#else
+    // TODO: implement this ourselves
+    return false;
+#endif // wxHAS_STRTOLL
+}
+
+bool wxString::ToULongLong(wxULongLong_t *val, int base) const
+{
+#ifdef wxHAS_STRTOLL
+    return wxStringToIntType(c_str(), val, base, wxStrtoull);
+#else
+    // TODO: implement this ourselves
+    return false;
+#endif
+}
+
 bool wxString::ToDouble(double *val) const
 {
     wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );
 
+    errno = 0;
+
     const wxChar *start = c_str();
     wxChar *end;
     *val = wxStrtod(start, &end);
@@ -1791,9 +1815,11 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
             // 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
         {