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

INTEGRATION: CWS cmcfixes28 (1.30.18); FILE MERGED

Browse Source 
2006/10/02 14:38:05 cmc 1.30.18.1: #i70042# ignore out of bounds wmf/emf values
This commit is contained in:
Oliver Bolte
2006-10-11 08:24:48 +00:00
parent 863e76a5bb
commit 0193c048c1
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
svtools/source/filter.vcl/wmf/winwmf.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: winwmf.cxx,v $
*
* $Revision: 1.30 $
* $Revision: 1.31 $
*
* last change: $Author: obo $ $Date: 2006-09-17 14:55:43 $
* last change: $Author: obo $ $Date: 2006-10-11 09:24:48 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -866,17 +866,21 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
aMemoryStream >> aPt.X()
>> aPt.Y()
>> nStringLen;
sal_Unicode* pBuf = aString.AllocBuffer( (sal_uInt16)nStringLen );
for ( i = 0; i < nStringLen; i++ )
aMemoryStream >> pBuf[ i ];
aMemoryStream >> nDXCount;
if ( nDXCount )
pDXAry = new sal_Int32[ nDXCount ];
for ( i = 0; i < nDXCount; i++ )
aMemoryStream >> pDXAry[ i ];
aMemoryStream >> nSkipActions;
pOut->DrawText( aPt, aString, pDXAry );
delete[] pDXAry;
if (nStringLen < STRING_MAXLEN)
{
sal_Unicode* pBuf = aString.AllocBuffer( (xub_StrLen)nStringLen );
for ( i = 0; i < nStringLen; i++ )
aMemoryStream >> pBuf[ i ];
aMemoryStream >> nDXCount;
if ( nDXCount )
pDXAry = new sal_Int32[ nDXCount ];
for ( i = 0; i < nDXCount; i++ )
aMemoryStream >> pDXAry[ i ];
aMemoryStream >> nSkipActions;
pOut->DrawText( aPt, aString, pDXAry );
delete[] pDXAry;
}
}
}
break;