1 files changed, 22 insertions, 2 deletions
diff --git a/java/util/zip/ZipFile.java b/java/util/zip/ZipFile.java
index 33f67c78b..0243abed1 100644
--- a/java/util/zip/ZipFile.java
+++ b/java/util/zip/ZipFile.java
@@ -48,6 +48,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -284,7 +285,15 @@ public class ZipFile implements ZipConstants
 	  buffer = new byte[needBuffer];
 
 	raf.readFully(buffer, 0, nameLen);
-	String name = new String(buffer, 0, 0, nameLen);
+	String name;
+	try
+	  {
+	    name = new String(buffer, 0, nameLen, "UTF-8");
+	  }
+	catch (UnsupportedEncodingException uee)
+	  {
+	    throw new AssertionError(uee);
+	  }
 
 	ZipEntry entry = new ZipEntry(name);
 	entry.setMethod(method);
@@ -301,7 +310,14 @@ public class ZipFile implements ZipConstants
 	if (commentLen > 0)
 	  {
 	    raf.readFully(buffer, 0, commentLen);
-	    entry.setComment(new String(buffer, 0, commentLen));
+	    try
+	      {
+		entry.setComment(new String(buffer, 0, commentLen, "UTF-8"));
+	      }
+	    catch (UnsupportedEncodingException uee)
+	      {
+		throw new AssertionError(uee);
+	      }
 	  }
 	entry.offset = offset;
 	entries.put(name, entry);
@@ -317,6 +333,10 @@ public class ZipFile implements ZipConstants
    */
   public void close() throws IOException
   {
+    RandomAccessFile raf = this.raf;
+    if (raf == null)
+      return;
+
     synchronized (raf)
       {
 	closed = true;