check index in GetString()

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index fdd9b43da6c49ac2135d59a0441b2b6d265cc6be..c187d9ecc75ef2f05485fc205c175616a5ef0bed 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -177,8 +177,12 @@ void wxChoice::SetString(int n, const wxString& s)
 
 wxString wxChoice::GetString(int n) const
 {
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), _T(""),
+                    _T("wxChoice::GetString(): invalid index") );
+
     return m_strings[n] ;
 }
+
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index fdd9b43da6c49ac2135d59a0441b2b6d265cc6be..c187d9ecc75ef2f05485fc205c175616a5ef0bed 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -177,8 +177,12 @@ void wxChoice::SetString(int n, const wxString& s)
 
 wxString wxChoice::GetString(int n) const
 {
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), _T(""),
+                    _T("wxChoice::GetString(): invalid index") );
+
     return m_strings[n] ;
 }
+
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------