summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-12-19 10:32:22 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-19 11:31:10 +0000
commit1aef38545edfd02a7a5fc38285cab5f20010e4b0 (patch)
tree802df22bac8ecbb0d66f38ec7613cdd1823048e3 /svtools
parent5a3cbd3b7ad7b99afef920338b3c42a3867b0412 (diff)
CID#736018 (unlikely) invalid iterator use
Change-Id: I56899cfa1010f547c2793b5248dc91a3ceb4cdb4
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/imivctl2.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index 508e57f88e18..2da626eb49bb 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -204,7 +204,11 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchRow(sal_uInt16 nRow, sal_uInt16 nL
if( bSimple )
{
SvxIconChoiceCtrlEntryPtrVec::const_iterator it = std::find( rList.begin(), rList.end(), pCurEntry );
- DBG_ASSERT( it != rList.end(), "Entry not in Row-List" );
+
+ assert(it != rList.end()); //Entry not in Row-List
+ if (it == rList.end())
+ return 0;
+
if( bRight )
{
while( ++it != rList.end() )