[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/source

Michael Meeks michael at kemper.freedesktop.org
Tue May 10 01:51:29 PDT 2011


 vcl/source/window/accel.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e39ce42790f1a5e99a2d41edb71976b94d12b992
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon May 9 21:43:31 2011 +0100

    fix crash with out of bound accelerater vector access fdo#36802

diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 83b765f..c17bd20 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -118,7 +118,9 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry )
         do
         {
             nIndex++;
-            ImplAccelEntry* pTempEntry = (*pList)[ nIndex ];
+            ImplAccelEntry* pTempEntry = NULL;
+            if ( nIndex < pList->size() )
+                pTempEntry = (*pList)[ nIndex ];
             if ( !pTempEntry || (pTempEntry->mnId != pEntry->mnId) )
                 break;
         }


More information about the Libreoffice-commits mailing list