2008-02-12 Roman Kennke <kennke@aicas.com>

	* java/awt/color/ICC_Profile.java
	(getInstance()): Wrap call to InputStream.read(byte[],int,int) in
	a loop, in order to read the whole thing.

2 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7790afe64..36b218cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-12  Roman Kennke  <kennke@aicas.com>
+
+	* java/awt/color/ICC_Profile.java
+	(getInstance()): Wrap call to InputStream.read(byte[],int,int) in
+	a loop, in order to read the whole thing.
+
 2008-02-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* javax/management/remote/NotificationResult.java:
diff --git a/java/awt/color/ICC_Profile.java b/java/awt/color/ICC_Profile.java
index 1072cd694..e2efb3a89 100644
--- a/java/awt/color/ICC_Profile.java
+++ b/java/awt/color/ICC_Profile.java
@@ -426,10 +426,15 @@ public class ICC_Profile implements Serializable
     System.arraycopy(headerData, 0, data, 0, ProfileHeader.HEADERSIZE);
 
     // read the rest
-    if (in.read(data, ProfileHeader.HEADERSIZE,
-                header.getSize() - ProfileHeader.HEADERSIZE) != header.getSize()
-        - ProfileHeader.HEADERSIZE)
-      throw new IOException("Incorrect profile size");
+    int totalBytes = header.getSize() - ProfileHeader.HEADERSIZE;
+    int bytesLeft = totalBytes;
+    while (bytesLeft > 0)
+      {
+    	int read = in.read(data,
+                           ProfileHeader.HEADERSIZE + (totalBytes - bytesLeft),
+                           bytesLeft);
+    	bytesLeft -= read;
+      }
 
     return getInstance(data);
   }