[4.1] Patch: FYI: ZipFile fixlet

[4.1] Patch: FYI: ZipFile fixlet

[Tom Tromey]

I'm checking this in.

Currently our ZipFile will fail if you try to get an entry whose name
contains a non-ASCII character.  The length check is incorrect... and
there's really no point to checking the length anyway, as we already
know the entry's name matches.

This is already fixed in Classpath.

Tom

Index: classpath/ChangeLog.gcj
from  Tom Tromey  <tromey@redhat.com>

	* java/util/zip/ZipFile.java (checkLocalHeader): Don't check name
	length.

Index: classpath/java/util/zip/ZipFile.java
===================================================================
--- classpath/java/util/zip/ZipFile.java	(revision 112714)
+++ classpath/java/util/zip/ZipFile.java	(working copy)
@@ -1,5 +1,5 @@
 /* ZipFile.java --
-   Copyright (C) 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -457,10 +457,8 @@
 	if (entry.getMethod() != readLeShort(locBuf, LOCHOW))
 	  throw new ZipException("Compression method mismatch: " + name);
 
-	if (entry.getName().length() != readLeShort(locBuf, LOCNAM))
-	  throw new ZipException("file name length mismatch: " + name);
-
-	int extraLen = entry.getName().length() + readLeShort(locBuf, LOCEXT);
+	int nameLen = readLeShort(locBuf, LOCNAM);
+	int extraLen = nameLen + readLeShort(locBuf, LOCEXT);
 	return entry.offset + LOCHDR + extraLen;
       }
   }