Attachment 317014 Details for Bug 462639 – upstream's patch (original horrific patch format)

[patch] upstream's patch (original horrific patch format)

winwmf.patch (text/plain), 1.17 KB, created by Caolan McNamara on 2008-09-17 21:58:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2008-09-17 21:58:36 UTC

Size: 1.17 KB

patch

obsolete

>Index: winwmf.cxx
>===================================================================
>RCS file: /cvs/util/svtools/source/filter.vcl/wmf/winwmf.cxx,v
>retrieving revision 1.36
>diff -r1.36 winwmf.cxx
>818a819,828
>> 			// nRecSize has been checked previously to be greater than 3
>> 			sal_uInt64 nMetaRecSize = static_cast< sal_uInt64 >( nRecSize - 2 ) * 2;
>> 			sal_uInt64 nMetaRecEndPos = pWMF->Tell() + nMetaRecSize;
>> 
>> 			// taking care that nRecSize does not exceed the maximal stream position
>> 			if ( nMetaRecEndPos > nEndPos )
>> 			{
>> 				pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
>> 				break;
>> 			}
>841c851,857
>< 						if ( nEscLen )
>---
>> 
>> 						if ( ( static_cast< sal_uInt64 >( nEscLen ) + pWMF->Tell() ) > nMetaRecEndPos )
>> 						{
>> 							pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
>> 							break;
>> 						}
>> 						if ( nEscLen > 0 )
>866c882
>< 										if (nStringLen < STRING_MAXLEN)
>---
>> 										if ( ( static_cast< sal_uInt64 >( nStringLen ) * sizeof( sal_Unicode ) ) < ( nEscLen - aMemoryStream.Tell() ) )
>871a888,889
>> 											if ( ( static_cast< sal_uInt64 >( nDXCount ) * sizeof( sal_Int32 ) ) >= ( nEscLen - aMemoryStream.Tell() ) )
>> 												nDXCount = 0;
>

Actions: View | Diff

Attachments on bug 462639: 317014 | 317041