From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 24 Apr 2006 17:59:10 +0000 (+0000)
Subject: don't use invalid/uninitialized iterator in wxList::compatibility_iterator in wxUSE_S... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7d13fbc6dc2c70d7423c68b422a708ac1c64d201

don't use invalid/uninitialized iterator in wxList::compatibility_iterator in wxUSE_STL==1 case, this doesn't work with the debug version of glibc STL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/list.h b/include/wx/list.h
index b875444930..187f003c42 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -136,7 +136,7 @@ private:
 #endif // defined( __VISUALC__ )
 
 /*
-    Note: the outer helper class _WX_LIST_HELPER_##liT below is a workaround
+    Note 1: the outer helper class _WX_LIST_HELPER_##liT below is a workaround
     for mingw 3.2.3 compiler bug that prevents a static function of liT class
     from being exported into dll. A minimal code snippet reproducing the bug:
 
@@ -155,6 +155,13 @@ private:
 
     The program does not link under mingw_gcc 3.2.3 producing undefined
     reference to Foo::Bar() function
+
+
+    Note 2: the EmptyList is needed to allow having a NULL pointer-like
+    invalid iterator. We used to use just an uninitialized iterator object
+    instead but this fails with some debug/checked versions of STL, notably the
+    glibc version activated with _GLIBCXX_DEBUG, so we need to have a separate
+    invalid iterator.
  */
 
 // the real wxList-class declaration
@@ -170,6 +177,9 @@ private:
     decl liT : public std::list<elT>                                          \
     {                                                                         \
     private:                                                                  \
+        typedef std::list<elT> BaseListType;                                  \
+        static BaseListType EmptyList;                                        \
+                                                                              \
         bool m_destroy;                                                       \
     public:                                                                   \
         decl compatibility_iterator                                           \
@@ -183,7 +193,7 @@ private:
             liT * m_list;                                                     \
         public:                                                               \
             compatibility_iterator()                                          \
-                : m_iter(), m_list( NULL ) {}                                 \
+                : m_iter(EmptyList.end()), m_list( NULL ) {}                  \
             compatibility_iterator( liT* li, iterator i )                     \
                 : m_iter( i ), m_list( li ) {}                                \
             compatibility_iterator( const liT* li, iterator i )               \
diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index 7f3cdb7d18..c4c8e020d0 100644
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -11,14 +11,15 @@
 
 #if wxUSE_STL
 
-    #undef  WX_DEFINE_LIST
-    #define WX_DEFINE_LIST(name)                                                   \
-        void _WX_LIST_HELPER_##name::DeleteFunction( _WX_LIST_ITEM_TYPE_##name X ) \
-        {                                                                          \
-            delete X;                                                              \
-        }
+#undef  WX_DEFINE_LIST
+#define WX_DEFINE_LIST(name)                                                  \
+    void _WX_LIST_HELPER_##name::DeleteFunction( _WX_LIST_ITEM_TYPE_##name X )\
+    {                                                                         \
+        delete X;                                                             \
+    }                                                                         \
+    name::BaseListType name::EmptyList;
 
-#else // if !wxUSE_STL
+#else // !wxUSE_STL
 
     #define _DEFINE_LIST(T, name)         \
         void wx##name##Node::DeleteData() \
@@ -34,5 +35,5 @@
     // don't pollute preprocessor's name space
     //#undef  _DEFINE_LIST
 
-#endif
+#endif // wxUSE_STL/!wxUSE_STL