Fix possible oob when trying to erase an element. Please review and signoff
for merging into 3.4.1
From eb95ef34e1e10787e582726bb660b821bdee74b3 Mon Sep 17 00:00:00 2001
From: Rafael Dominguez <venccsra...@gmail.com>
Date: Thu, 26 May 2011 15:33:07 -0430
Subject: [PATCH] Make sure we dont oob when erasing.
---
vcl/source/control/ilstbox.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 340a349..cbe5de3 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -274,10 +274,10 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry
void ImplEntryList::RemoveEntry( sal_uInt16 nPos )
{
- boost::ptr_vector<ImplEntryType>::iterator iter = maEntries.begin()+ nPos;
-
- if (iter != maEntries.end())
+ if (nPos < maEntries.size())
{
+ boost::ptr_vector<ImplEntryType>::iterator iter = maEntries.begin()+ nPos;
+
if ( !!iter->maImage )
mnImages--;
--
1.7.3.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
