[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source

Steve Yin steve_y at apache.org
Wed Apr 16 01:07:46 PDT 2014


 filter/source/msfilter/escherex.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcd42eb4039ce1bc1f5d9fa005036fd4fe59e2c6
Author: Steve Yin <steve_y at apache.org>
Date:   Wed Apr 16 07:48:58 2014 +0000

    Issue 124661 - crash when loading and re-saving attached ppt file with a single customshape

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 3df2193..328bbfd 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2558,7 +2558,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape,
         if ( pAny )
             *pAny >>= sEquationSource;
         sal_Int32 nEquationSourceCount = sEquationSource.getLength();
-        if ( nEquationSourceCount )
+        if ( nEquationSourceCount && (nEquationSourceCount <= 128) )
         {
             sal_Int32 i;
             for ( i = 0; i < nEquationSourceCount; i++ )


More information about the Libreoffice-commits mailing list