mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#78040 nAryLen is traditionally 32bit not 16bit

Browse Source 
30bb1eddba originally incorrectly
changed some different 16bit numbers to 32bit, then
02abb559fb reverted those 16bit->32bit
changes but accidentally changed the 32bit nAryLen to 16bit but
that was 32bit before 30bb1eddba

Change-Id: I36863b62418d7a3b5ccce51aef86c63c523f9598
This commit is contained in:
Caolán McNamara
2014-05-27 21:03:26 +01:00
parent c26ba0d35e
commit 5326c56346
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vcl/source/gdi/metaact.cxx
View File

@@ -1094,7 +1094,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) :
{ {
if( rAction.mpDXAry ) if( rAction.mpDXAry )
{ {
const sal_uLong nAryLen = mnLen; const sal_Int32 nAryLen = mnLen;
mpDXAry = new sal_Int32[ nAryLen ]; mpDXAry = new sal_Int32[ nAryLen ];
memcpy( mpDXAry, rAction.mpDXAry, nAryLen * sizeof( sal_Int32 ) ); memcpy( mpDXAry, rAction.mpDXAry, nAryLen * sizeof( sal_Int32 ) );
@@ -1114,7 +1114,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
mnIndex ( nIndex ), mnIndex ( nIndex ),
mnLen ( nLen ) mnLen ( nLen )
{ {
const sal_uLong nAryLen = pDXAry ? mnLen : 0; const sal_Int32 nAryLen = pDXAry ? mnLen : 0;
if( nAryLen ) if( nAryLen )
{ {
@@ -1177,7 +1177,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
rOStm.WriteUInt16(mnIndex); rOStm.WriteUInt16(mnIndex);
rOStm.WriteUInt16(mnLen); rOStm.WriteUInt16(mnLen);
rOStm.WriteUInt16(nAryLen); rOStm.WriteInt32(nAryLen);
for (sal_Int32 i = 0; i < nAryLen; ++i) for (sal_Int32 i = 0; i < nAryLen; ++i)
rOStm.WriteInt32( mpDXAry[ i ] ); rOStm.WriteInt32( mpDXAry[ i ] );
@@ -1187,8 +1187,6 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
{ {
sal_Int32 nAryLen;
delete[] mpDXAry; delete[] mpDXAry;
VersionCompat aCompat(rIStm, STREAM_READ); VersionCompat aCompat(rIStm, STREAM_READ);
@@ -1200,9 +1198,8 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
sal_uInt16 nTmpLen(0); sal_uInt16 nTmpLen(0);
rIStm.ReadUInt16(nTmpLen); rIStm.ReadUInt16(nTmpLen);
mnLen = nTmpLen; mnLen = nTmpLen;
sal_uInt16 nTmpAryLen(0); sal_Int32 nAryLen(0);
rIStm.ReadUInt16(nTmpAryLen); rIStm.ReadInt32(nAryLen);
nAryLen = nTmpAryLen;
if ( mnIndex + mnLen > maStr.getLength() ) if ( mnIndex + mnLen > maStr.getLength() )
{ {