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

[wxWidgets.git] / include / wx / vector.h

diff --git a/include/wx/vector.h b/include/wx/vector.h
index ab07ca0f4a8c1eb0f7c8f955e5db0fbca4d5f587..d558e774e603357e8a46623b21c2e7ff0f3318a1 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -14,12 +14,19 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
 
 #include <vector>
+#include <algorithm>
+
 #define wxVector std::vector
+template<typename T>
+inline void wxVectorSort(wxVector<T>& v)
+{
+    std::sort(v.begin(), v.end());
+}
 
-#else // !wxUSE_STL
+#else // !wxUSE_STD_CONTAINERS
 
 #include "wx/utils.h"
 #include "wx/scopeguard.h"
@@ -111,7 +118,10 @@ private:
     // Note that we use typedef instead of privately deriving from this (which
     // would allowed us to omit "Ops::" prefixes below) to keep VC6 happy,
     // it can't compile code that derives from wxIf<...>::value.
-    typedef typename wxIf< wxIsMovable<T>::value,
+    //
+    // Note that bcc needs the extra parentheses for non-type template
+    // arguments to compile this expression.
+    typedef typename wxIf< (wxIsMovable<T>::value),
                            wxPrivate::wxVectorMemOpsMovable<T>,
                            wxPrivate::wxVectorMemOpsGeneric<T> >::value
             Ops;
@@ -169,19 +179,19 @@ public:
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
-    wxVector(size_type size)
+    wxVector(size_type p_size)
         : m_size(0), m_capacity(0), m_values(NULL)
     {
-        reserve(size);
-        for ( size_t n = 0; n < size; n++ )
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
             push_back(value_type());
     }
 
-    wxVector(size_type size, const value_type& v)
+    wxVector(size_type p_size, const value_type& v)
         : m_size(0), m_capacity(0), m_values(NULL)
     {
-        reserve(size);
-        for ( size_t n = 0; n < size; n++ )
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
             push_back(v);
     }
 
@@ -195,6 +205,21 @@ public:
         clear();
     }
 
+    void assign(size_type p_size, const value_type& v)
+    {
+        clear();
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(v);
+    }
+
+    void swap(wxVector& v)
+    {
+        wxSwap(m_size, v.m_size);
+        wxSwap(m_capacity, v.m_capacity);
+        wxSwap(m_values, v.m_values);
+    }
+
     void clear()
     {
         // call destructors of stored objects:
@@ -430,7 +455,45 @@ inline typename wxVector<T>::size_type wxVector<T>::erase(size_type n)
 }
 #endif // WXWIN_COMPATIBILITY_2_8
 
-#endif // wxUSE_STL/!wxUSE_STL
+
+
+namespace wxPrivate
+{
+
+// This is a helper for the wxVectorSort function, and should not be used
+// directly in user's code.
+template<typename T>
+struct wxVectorComparator
+{
+    static int
+    Compare(const void* pitem1, const void* pitem2, const void* )
+    {
+        const T& item1 = *reinterpret_cast<const T*>(pitem1);
+        const T& item2 = *reinterpret_cast<const T*>(pitem2);
+
+        if (item1 < item2)
+            return -1;
+        else if (item2 < item1)
+            return 1;
+        else
+            return 0;
+    }
+};
+
+}  // namespace wxPrivate
+
+
+
+template<typename T>
+void wxVectorSort(wxVector<T>& v)
+{
+    wxQsort(v.begin(), v.size(), sizeof(T),
+            wxPrivate::wxVectorComparator<T>::Compare, NULL);
+}
+
+
+
+#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
 
 #if WXWIN_COMPATIBILITY_2_8
     #define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector<obj> cls