Attachment 161195 Details for Bug 251967 – proposed patch

[patch] proposed patch

itiff.patch (text/plain), 2.44 KB, created by Mark J. Cox on 2007-08-13 18:06:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark J. Cox

Created: 2007-08-13 18:06:49 UTC

Size: 2.44 KB

patch

obsolete

>Index: itiff.cxx
>===================================================================
>RCS file: /cvs/graphics/goodies/source/filter.vcl/itiff/itiff.cxx,v
>retrieving revision 1.13
>diff -r1.13 itiff.cxx
>135c135
>< 	void	ReadTagData( USHORT nTagType, ULONG nDataLen );
>---
>> 	void	ReadTagData( USHORT nTagType, sal_uInt32 nDataLen );
>293c293
>< void TIFFReader::ReadTagData( USHORT nTagType, ULONG nDataLen)
>---
>> void TIFFReader::ReadTagData( USHORT nTagType, sal_uInt32 nDataLen)
>356c356,357
>< 			if ( pOldSO == NULL ) nNumStripOffsets = 0;	// Sicherheitshalber
>---
>> 			if ( pOldSO == NULL )
>> 				nNumStripOffsets = 0;
>358,364c359,372
>< 			nNumStripOffsets += nDataLen;
>< 			pStripOffsets = new ULONG[ nNumStripOffsets ];
>< 			for ( i = 0; i < nOldNumSO; i++ )
>< 				pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
>< 			for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
>< 				pStripOffsets[ i ] = ReadIntData() + nOrigPos;
>< 			if ( pOldSO != NULL )
>---
>> 			nDataLen += nOldNumSO;
>> 			if ( ( nDataLen > nOldNumSO ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
>> 			{
>> 				nNumStripOffsets = nDataLen;
>> 				pStripOffsets = new ULONG[ nNumStripOffsets ];
>> 				if ( !pStripOffsets )
>> 					nNumStripOffsets = 0;
>> 				else
>> 				{
>> 					for ( i = 0; i < nOldNumSO; i++ )
>> 						pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
>> 					for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
>> 						pStripOffsets[ i ] = ReadIntData() + nOrigPos;
>> 				}
>365a374
>> 			}
>387c396,397
>< 			if ( pOldSBC == NULL ) nNumStripByteCounts = 0; // Sicherheitshalber
>---
>> 			if ( pOldSBC == NULL )
>> 				nNumStripByteCounts = 0; // Sicherheitshalber
>389,395c399,412
>< 			nNumStripByteCounts += nDataLen;
>< 			pStripByteCounts = new ULONG[ nNumStripByteCounts ];
>< 			for ( i = 0; i < nOldNumSBC; i++ )
>< 				pStripByteCounts[ i ] = pOldSBC[ i ];
>< 			for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
>< 				pStripByteCounts[ i ] = ReadIntData();
>< 			if ( pOldSBC != NULL )
>---
>> 			nDataLen += nOldNumSBC;
>> 			if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
>> 			{		
>> 				nNumStripByteCounts = nDataLen;
>> 				pStripByteCounts = new ULONG[ nNumStripByteCounts ];
>> 				if ( !nNumStripByteCounts )
>> 					nNumStripByteCounts = 0;
>> 				else
>> 				{
>> 					for ( i = 0; i < nOldNumSBC; i++ )
>> 						pStripByteCounts[ i ] = pOldSBC[ i ];
>> 					for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
>> 						pStripByteCounts[ i ] = ReadIntData();
>> 				}
>396a414
>> 			}
>

Actions: View | Diff

Attachments on bug 251967: 161195