Attachment 699615 Details for Bug 847519 – patch solving the problem

[patch] patch solving the problem

0001-resolved-rhbz-847519-do-not-access-vector-elements-b.patch (text/plain), 2.94 KB, created by Eike Rathke on 2013-02-19 19:51:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eike Rathke

Created: 2013-02-19 19:51:26 UTC

Size: 2.94 KB

patch

obsolete

>From 9df1f002fd36b7b3faf8ae5d750070223294ee5d Mon Sep 17 00:00:00 2001
>Message-Id: <9df1f002fd36b7b3faf8ae5d750070223294ee5d.1361299461.git.erack@redhat.com>
>From: Eike Rathke <erack@redhat.com>
>Date: Tue, 19 Feb 2013 19:22:27 +0100
>Subject: [PATCH] resolved rhbz#847519 do not access vector elements beyond
> size
>MIME-Version: 1.0
>Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
>
>This is a multi-part message in MIME format.
>--------------erAck-patch-parts
>Content-Type: text/plain; charset=UTF-8; format=fixed
>Content-Transfer-Encoding: 8bit
>
>---
> chart2/source/tools/ExplicitCategoriesProvider.cxx |   24 ++++++++++++-------
> 1 files changed, 15 insertions(+), 9 deletions(-)
>
>
>--------------erAck-patch-parts
>Content-Type: text/x-patch; name="0001-resolved-rhbz-847519-do-not-access-vector-elements-b.patch"
>Content-Transfer-Encoding: 8bit
>Content-Disposition: attachment; filename="0001-resolved-rhbz-847519-do-not-access-vector-elements-b.patch"
>
>diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
>index c45ebde..cc2f303 100644
>--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
>+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
>@@ -360,11 +360,14 @@ Sequence< OUString > lcl_getExplicitSimpleCategories(
>         }
>         for( aOuterIt=rComplexCats.begin(); aOuterIt != aOuterEnd; ++aOuterIt )
>         {
>-            sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt );
>-            if( nCurrentCount< nMaxCategoryCount )
>+            if ( aOuterIt->size() > 0 )
>             {
>-                ComplexCategory& rComplexCategory = aOuterIt->back();
>-                rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount);
>+                sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt );
>+                if( nCurrentCount< nMaxCategoryCount )
>+                {
>+                    ComplexCategory& rComplexCategory = aOuterIt->back();
>+                    rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount);
>+                }
>             }
>         }
>     }
>@@ -396,12 +399,15 @@ Sequence< OUString > lcl_getExplicitSimpleCategories(
>             OUString aText;
>             for( aOuterIt=aComplexCatsPerIndex.begin() ; aOuterIt != aOuterEnd; ++aOuterIt )
>             {
>-                OUString aAddText = (*aOuterIt)[nN].Text;
>-                if( aAddText.getLength() )
>+                if ( nN < aOuterIt->size() )
>                 {
>-                    if(aText.getLength())
>-                        aText += aSpace;
>-                    aText += aAddText;
>+                    OUString aAddText = (*aOuterIt)[nN].Text;
>+                    if( aAddText.getLength() )
>+                    {
>+                        if(aText.getLength())
>+                            aText += aSpace;
>+                        aText += aAddText;
>+                    }
>                 }
>             }
>             aRet[nN]=aText;
>
>--------------erAck-patch-parts--
>
>

Actions: View | Diff

Attachments on bug 847519: 603789 | 603790 | 603791 | 603792 | 603793 | 603794 | 699615