fixing overrelease and out-of-bounds write, fixes #13725

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

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 488cb1565aa602104be55a7a014681ea24353817..1ceefe012303c0677d29e8b557b4face30673d26 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/longlong.cpp
+// Name:        src/common/longlong.cpp

 // Purpose:     implementation of wxLongLongNative
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
 // Remarks:     this class is not public in wxWidgets 2.0! It is intentionally
 // Purpose:     implementation of wxLongLongNative
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
 // Remarks:     this class is not public in wxWidgets 2.0! It is intentionally


@@ -22,15 +22,19 @@
 #endif
 
 #if wxUSE_LONGLONG
 #endif
 
 #if wxUSE_LONGLONG

+

 #include "wx/longlong.h"
 #include "wx/longlong.h"

-#include "wx/math.h"       // for fabs()

 
 

-#if defined(__MWERKS__) && defined(__WXMSW__)
-#include <string.h>     // for memset()
-#else
-#include <memory.h>     // for memset()
+#ifndef WX_PRECOMP
+    #include "wx/math.h"       // for fabs()
+#endif
+
+#if wxUSE_STREAMS
+    #include "wx/txtstrm.h"

 #endif
 
 #endif
 

+#include <string.h>            // for memset()
+

 #include "wx/ioswrap.h"
 
 // ============================================================================
 #include "wx/ioswrap.h"
 
 // ============================================================================


@@ -47,14 +51,14 @@ void *wxLongLongNative::asArray() const
 {
     static unsigned char temp[8];
 
 {
     static unsigned char temp[8];
 

-    temp[0] = (unsigned char)((m_ll >> 56) & 0xFF);
-    temp[1] = (unsigned char)((m_ll >> 48) & 0xFF);
-    temp[2] = (unsigned char)((m_ll >> 40) & 0xFF);
-    temp[3] = (unsigned char)((m_ll >> 32) & 0xFF);
-    temp[4] = (unsigned char)((m_ll >> 24) & 0xFF);
-    temp[5] = (unsigned char)((m_ll >> 16) & 0xFF);
-    temp[6] = (unsigned char)((m_ll >> 8)  & 0xFF);
-    temp[7] = (unsigned char)((m_ll >> 0)  & 0xFF);
+    temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
+    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
+    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
+    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
+    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
+    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
+    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
+    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));

 
     return temp;
 }
 
     return temp;
 }


@@ -63,14 +67,14 @@ void *wxULongLongNative::asArray() const
 {
     static unsigned char temp[8];
 
 {
     static unsigned char temp[8];
 

-    temp[0] = (unsigned char)((m_ll >> 56) & 0xFF);
-    temp[1] = (unsigned char)((m_ll >> 48) & 0xFF);
-    temp[2] = (unsigned char)((m_ll >> 40) & 0xFF);
-    temp[3] = (unsigned char)((m_ll >> 32) & 0xFF);
-    temp[4] = (unsigned char)((m_ll >> 24) & 0xFF);
-    temp[5] = (unsigned char)((m_ll >> 16) & 0xFF);
-    temp[6] = (unsigned char)((m_ll >> 8)  & 0xFF);
-    temp[7] = (unsigned char)((m_ll >> 0)  & 0xFF);
+    temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
+    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
+    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
+    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
+    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
+    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
+    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
+    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));

 
     return temp;
 }
 
     return temp;
 }


@@ -92,8 +96,59 @@ wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
     m_ll |= ll.GetLo();
     return *this;
 }
     m_ll |= ll.GetLo();
     return *this;
 }

+
+wxLongLongNative& wxLongLongNative::operator=(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ll.GetLo();
+    return *this;
+}
+
+wxULongLongNative::wxULongLongNative(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+}
+
+wxULongLongNative& wxULongLongNative::operator=(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+    return *this;
+}
+
+wxULongLongNative& wxULongLongNative::operator=(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+    return *this;
+}

 #endif
 
 #endif
 

+#ifdef __VISUALC6__
+double wxULongLongNative::ToDouble() const
+{
+    // Work around the problem of casting unsigned __int64 to double in VC6
+    // (which for unknown reasons only manifests itself in DLL builds, i.e.
+    // when using /MD).
+    static const __int64 int64_t_max = 9223372036854775807i64;
+    if ( m_ll <= int64_t_max )
+        return wx_truncate_cast(double, (wxLongLong_t)m_ll);
+
+    double d = wx_truncate_cast(double, int64_t_max);
+    d += (__int64)(m_ll - int64_t_max - 1); // The cast is safe because of -1
+    return d + 1;
+}
+#endif // __VISUALC6__
+

 #endif // wxUSE_LONGLONG_NATIVE
 
 // ============================================================================
 #endif // wxUSE_LONGLONG_NATIVE
 
 // ============================================================================


@@ -102,6 +157,14 @@ wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
 
 #if wxUSE_LONGLONG_WX
 
 
 #if wxUSE_LONGLONG_WX
 

+// Set value from unsigned wxULongLongWx
+wxLongLongWx &wxLongLongWx::operator=(const class wxULongLongWx &ll)
+{
+    m_hi = (unsigned long) ll.GetHi();
+    m_lo = ll.GetLo();
+    return *this;
+}
+

 // assignment
 wxLongLongWx& wxLongLongWx::Assign(double d)
 {
 // assignment
 wxLongLongWx& wxLongLongWx::Assign(double d)
 {


@@ -143,6 +206,19 @@ double wxLongLongWx::ToDouble() const
     return d;
 }
 
     return d;
 }
 

+double wxULongLongWx::ToDouble() const
+{
+    unsigned double d = m_hi;
+    d *= 1.0 + (double)ULONG_MAX;
+    d += m_lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxASSERT( d == m_ll );
+#endif // wxLONGLONG_TEST_MODE
+
+    return d;
+}
+

 wxLongLongWx wxLongLongWx::operator<<(int shift) const
 {
     wxLongLongWx ll(*this);
 wxLongLongWx wxLongLongWx::operator<<(int shift) const
 {
     wxLongLongWx ll(*this);


@@ -1112,7 +1188,7 @@ void *wxULongLongWx::asArray(void) const
             while ( ll != 0 )                                        \
             {                                                        \
                 long digit = (ll % 10).ToLong();                     \
             while ( ll != 0 )                                        \
             {                                                        \
                 long digit = (ll % 10).ToLong();                     \

-                result.Prepend((wxChar)(_T('0') - digit));           \
+                result.Prepend((wxChar)(wxT('0') - digit));          \

                 ll /= 10;                                            \
             }                                                        \
         }                                                            \
                 ll /= 10;                                            \
             }                                                        \
         }                                                            \


@@ -1121,15 +1197,15 @@ void *wxULongLongWx::asArray(void) const
             while ( ll != 0 )                                        \
             {                                                        \
                 long digit = (ll % 10).ToLong();                     \
             while ( ll != 0 )                                        \
             {                                                        \
                 long digit = (ll % 10).ToLong();                     \

-                result.Prepend((wxChar)(_T('0') + digit));           \
+                result.Prepend((wxChar)(wxT('0') + digit));          \

                 ll /= 10;                                            \
             }                                                        \
         }                                                            \
                                                                      \
         if ( result.empty() )                                        \
                 ll /= 10;                                            \
             }                                                        \
         }                                                            \
                                                                      \
         if ( result.empty() )                                        \

-            result = _T('0');                                        \
+            result = wxT('0');                                       \

         else if ( neg )                                              \
         else if ( neg )                                              \

-            result.Prepend(_T('-'));                                 \
+            result.Prepend(wxT('-'));                                \

                                                                      \
         return result;                                               \
     }
                                                                      \
         return result;                                               \
     }


@@ -1144,12 +1220,12 @@ void *wxULongLongWx::asArray(void) const
                                                                      \
         while ( ll != 0 )                                            \
         {                                                            \
                                                                      \
         while ( ll != 0 )                                            \
         {                                                            \

-            result.Prepend((wxChar)(_T('0') + (ll % 10).ToULong())); \
+            result.Prepend((wxChar)(wxT('0') + (ll % 10).ToULong())); \

             ll /= 10;                                                \
         }                                                            \
                                                                      \
         if ( result.empty() )                                        \
             ll /= 10;                                                \
         }                                                            \
                                                                      \
         if ( result.empty() )                                        \

-            result = _T('0');                                        \
+            result = wxT('0');                                       \

                                                                      \
         return result;                                               \
     }
                                                                      \
         return result;                                               \
     }


@@ -1191,4 +1267,113 @@ WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxULongLong& ll)
     return s << ll.ToString();
 }
 
     return s << ll.ToString();
 }
 

+#if wxUSE_STREAMS
+
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxULongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxLongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+#define READ_STRING_CHAR(s, idx, len) ((idx!=len) ? (wxChar)s[idx++] : wxT('\0'))
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
+{
+    wxString s = o.ReadWord();
+
+    ll = wxULongLong(0l, 0l);
+    size_t length = s.length();
+    size_t idx = 0;
+
+    wxChar ch = READ_STRING_CHAR(s, idx, length);
+
+    // Skip WS
+    while (ch==wxT(' ') || ch==wxT('\t'))
+        ch = READ_STRING_CHAR(s, idx, length);
+
+    // Read number
+    wxULongLong multiplier(0l, 10l);
+    while (ch>=wxT('0') && ch<=wxT('9')) {
+        long lValue = (unsigned) (ch - wxT('0'));
+        ll = ll * multiplier + wxULongLong(0l, lValue);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+    return o;
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong &ll)
+{
+    wxString s = o.ReadWord();
+
+    ll = wxLongLong(0l, 0l);
+    size_t length = s.length();
+    size_t idx = 0;
+
+    wxChar ch = READ_STRING_CHAR(s, idx, length);
+
+    // Skip WS
+    while (ch==wxT(' ') || ch==wxT('\t'))
+        ch = READ_STRING_CHAR(s, idx, length);
+
+    // Ask for sign
+    int iSign = 1;
+    if (ch==wxT('-') || ch==wxT('+')) {
+        iSign = ((ch==wxT('-')) ? -1 : 1);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+    // Read number
+    wxLongLong multiplier(0l, 10l);
+    while (ch>=wxT('0') && ch<=wxT('9')) {
+        long lValue = (unsigned) (ch - wxT('0'));
+        ll = ll * multiplier + wxLongLong(0l, lValue);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+#if wxUSE_LONGLONG_NATIVE
+    ll = ll * wxLongLong((wxLongLong_t) iSign);
+#else
+    ll = ll * wxLongLong((long) iSign);
+#endif
+
+    return o;
+}
+
+#if wxUSE_LONGLONG_NATIVE
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxULongLong_t value)
+{
+    return o << wxULongLong(value).ToString();
+}
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxLongLong_t value)
+{
+    return o << wxLongLong(value).ToString();
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong_t &value)
+{
+    wxULongLong ll;
+    o >> ll;
+    value = ll.GetValue();
+    return o;
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong_t &value)
+{
+    wxLongLong ll;
+    o >> ll;
+    value = ll.GetValue();
+    return o;
+}
+
+#endif // wxUSE_LONGLONG_NATIVE
+
+#endif // wxUSE_STREAMS
+

 #endif // wxUSE_LONGLONG
 #endif // wxUSE_LONGLONG