Author: acumiskey
Date: Tue Sep 9 04:00:58 2008
New Revision: 693433
URL: http://svn.apache.org/viewvc?rev=693433&view=rev
Log:
Make PFM string parsing a little more robust
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMInputStream.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMInputStream.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMInputStream.java?rev=693433&r1=693432&r2=693433&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMInputStream.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMInputStream.java
Tue Sep 9 04:00:58 2008
@@ -19,6 +19,7 @@
package org.apache.fop.fonts.type1;
+import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.DataInputStream;
@@ -30,7 +31,7 @@
*/
public class PFMInputStream extends java.io.FilterInputStream {
- private DataInputStream datain;
+ private final DataInputStream datain;
/**
* Constructs a PFMInputStream based on an InputStream representing the
@@ -97,10 +98,14 @@
public String readString() throws IOException {
InputStreamReader reader = new InputStreamReader(in, "ISO-8859-1");
StringBuffer buf = new StringBuffer();
+
int ch = reader.read();
while (ch != 0) {
buf.append((char)ch);
ch = reader.read();
+ if (ch == -1) {
+ throw new EOFException("Unexpected end of stream reached");
+ }
}
return buf.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
