You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2010/09/03 14:30:19 UTC
svn commit: r992278 -
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
Author: jukka
Date: Fri Sep 3 12:30:19 2010
New Revision: 992278
URL: http://svn.apache.org/viewvc?rev=992278&view=rev
Log:
PDFBOX-808: PDTrueTypeFont.loadTTF() freezes
Break the potential endless loop reported by Martin Hilpert.
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java?rev=992278&r1=992277&r2=992278&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java Fri Sep 3 12:30:19 2010
@@ -189,11 +189,10 @@ public abstract class TTFDataStream
byte[] data = new byte[ numberOfBytes ];
int amountRead = 0;
int totalAmountRead = 0;
- while( (amountRead = read( data, totalAmountRead, numberOfBytes-totalAmountRead ) ) != -1 &&
- totalAmountRead < numberOfBytes )
- {
+ //read at most numberOfBytes bytes from the stream.
+ while (totalAmountRead < numberOfBytes
+ && (amountRead = read( data, totalAmountRead, numberOfBytes-totalAmountRead ) ) != -1) {
totalAmountRead += amountRead;
- //read at most numberOfBytes bytes from the stream.
}
return data;
}