Commits

obo  committed e037e0a Merge

CWS-TOOLING: integrate CWS impress205

  • Participants
  • Parent commits 0a606d7, 98af19a

Comments (0)

Files changed (2)

File drawinglayer/source/primitive2d/metafileprimitive2d.cxx

 
 					if(nTextLength + nTextIndex > nStringLength)
 					{
-						nTextLength = nStringLength - nTextIndex;
+						nTextLength = nTextIndex > nStringLength ? 0 : nStringLength - nTextIndex;
 					}
 					
 					if(nTextLength && rPropertyHolders.Current().getTextColorActive())

File vcl/source/gdi/metaact.cxx

 	rIStm	>> mnLen;
 	rIStm	>> nAryLen;
 
-	if ( mnIndex > mnLen )
+	if ( mnIndex + mnLen > maStr.Len() )
 	{
 		mnIndex = 0;
 		mpDXAry = 0;
 		sal_Unicode* pBuffer = maStr.AllocBuffer( nLen );
 		while ( nLen-- )
 			rIStm >> *pBuffer++;
+
+		if ( mnIndex + mnLen > maStr.Len() )
+		{
+			mnIndex = 0;
+			delete[] mpDXAry, mpDXAry = NULL;
+		}
 	}
 }