/hg/release/icedtea6-1.7: Fix rhbz#560193

[dbhole at icedtea.classpath.org]

changeset e508d944ca9d in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=e508d944ca9d
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Aug 27 14:46:25 2010 -0400

	Fix rhbz#560193

	Process nested jars in applet code only if size > 0 bytes.


diffstat:

3 files changed, 16 insertions(+)
ChangeLog                                            |    7 +++++++
NEWS                                                 |    2 ++
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |    7 +++++++

diffs (50 lines):

diff -r c18673769bc8 -r e508d944ca9d ChangeLog
--- a/ChangeLog	Wed Aug 25 17:11:27 2010 +0100
+++ b/ChangeLog	Fri Aug 27 14:46:25 2010 -0400
@@ -1,3 +1,10 @@ 2010-07-30  Andrew John Hughes  <ahughes
+2010-08-27  Deepak Bhole <dbhole at redhat.com>
+
+	Fixes rhbz#560193
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(activateJars): Process nested jar only if size > 0 bytes.
+	* NEWS: Updated.
+
 2010-07-30  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add patch below.
diff -r c18673769bc8 -r e508d944ca9d NEWS
--- a/NEWS	Wed Aug 25 17:11:27 2010 +0100
+++ b/NEWS	Fri Aug 27 14:46:25 2010 -0400
@@ -9,6 +9,8 @@ New in release 1.7.5 (XXXX-XX-XX):
  - Run programs that inherit main(String[]) in their main-class
  - Work with JNLP files that use spec version 1.6
  - RH601281: Possible NullPointerException in splash screen code
+* Plugin 
+ - RH560193: Fix ziperror when applet jar contained another 0-byte jar
 
 New in release 1.7.4 (2010-07-28):
 
diff -r c18673769bc8 -r e508d944ca9d rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Aug 25 17:11:27 2010 +0100
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Aug 27 14:46:25 2010 -0400
@@ -639,13 +639,20 @@ public class JNLPClassLoader extends URL
 
                                     byte[] bytes = new byte[1024];
                                     int read = is.read(bytes);
+                                    int fileSize = read;
                                     while (read > 0) {
                                         extractedJar.write(bytes, 0, read);
                                         read = is.read(bytes);
+                                        fileSize += read;
                                     }
 
                                     is.close();
                                     extractedJar.close();
+                                    
+                                    // 0 byte file? skip
+                                    if (fileSize <= 0) {
+                                    	continue;
+                                    }
 
                                     JarSigner signer = new JarSigner();
                                     signer.verifyJar(extractedJarLocation);