From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Fri, 10 Mar 2006 09:59:38 +0000 (+0000)
Subject: Avoid unexpected negative array index (CID 41).
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9f322c6d8f4a09ceaa0b9d6835ded0ac3865968b

Avoid unexpected negative array index (CID 41).


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

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 83c06c71c6..51e081117d 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -1718,11 +1718,11 @@ void wxHtmlHelpWindow::OnSearch(wxCommandEvent& WXUNUSED(event))
 
 void wxHtmlHelpWindow::OnBookmarksSel(wxCommandEvent& WXUNUSED(event))
 {
-    wxString sr = m_Bookmarks->GetStringSelection();
-
-    if (sr != wxEmptyString && sr != _("(bookmarks)"))
+    wxString str = m_Bookmarks->GetStringSelection();
+    int idx = m_BookmarksNames.Index(str);
+    if (!str.empty() && str != _("(bookmarks)") && idx != wxNOT_FOUND)
     {
-       m_HtmlWin->LoadPage(m_BookmarksPages[m_BookmarksNames.Index(sr)]);
+       m_HtmlWin->LoadPage(m_BookmarksPages[(size_t)idx]);
        NotifyPageChanged();
     }
 }