summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2010-12-15 11:04:17 +0000
committerNoel Power <noel.power@novell.com>2010-12-15 11:04:17 +0000
commitf7b4914124087ef96f36c3f607a616e6e88f44a4 (patch)
treeb7e47736e5057faf3b2d6df8e715d512e5f1e432 /vcl
parent7e0fa16bb7fec449d3d1451719d9836b9ac616a9 (diff)
parent3d3105c8d406f1b90b10c40bd0c07602cd989291 (diff)
Merge commit 'ooo/OOO330_m18' into libreoffice-3-3
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/metaact.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index f8ab4fc2ad54..6f9d1a85e510 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1482,6 +1482,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;
+ }
}
}