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

[Noel Power]

 vcl/source/gdi/metaact.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 57944ebb711e7ee932891130254247a92c83b254
Merge: 5576727... f7a8cd0...
Author: Noel Power <noel.power at novell.com>
Date:   Wed Dec 15 11:04:17 2010 +0000

    Merge commit 'ooo/OOO330_m18' into libreoffice-3-3

commit f7a8cd0c613ff85a3436ccfec18755c38eeeb196
Merge: 6b4f105... dc6983f...
Author: obo <obo at openoffice.org>
Date:   Thu Dec 9 10:48:50 2010 +0100

    CWS-TOOLING: integrate CWS impress205

commit dc6983fdeb44160d3ae826bc00d0b00288926cd1
Author: sj <sj at openoffice.org>
Date:   Thu Dec 2 14:31:22 2010 +0100

    impress205: #i115825# fixed metatextarray issues

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index a30f545..f7df564 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1481,6 +1481,12 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
         sal_Unicode* pBuffer = maStr.AllocBuffer( nLen );
         while ( nLen-- )
             rIStm >> *pBuffer++;
+
+        if ( mnIndex + mnLen > maStr.Len() )
+        {
+            mnIndex = 0;
+            delete[] mpDXAry, mpDXAry = NULL;
+        }
     }
 }
 
commit c4d55cce165b9e375c1fa0e1638bfd2cf7c19c04
Author: sj <sj at openoffice.org>
Date:   Tue Nov 30 13:41:46 2010 +0100

    impress205: #i115825# fixed copy&paste problem of metafiles

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 5c8ff4d..a30f545 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1441,7 +1441,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     rIStm	>> mnLen;
     rIStm	>> nAryLen;
 
-    if ( mnIndex > mnLen )
+    if ( mnIndex + mnLen > maStr.Len() )
     {
         mnIndex = 0;
         mpDXAry = 0;