/hg/icedtea-web: Fix PR638: JNLPClassLoader.loadClass(String nam...

[omajid at icedtea.classpath.org]

changeset f14bd72dbb29 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f14bd72dbb29
author: Omair Majid <omajid at redhat.com>
date: Tue Feb 22 19:15:05 2011 -0500

	Fix PR638: JNLPClassLoader.loadClass(String name) can return null

	2011-02-22 Omair Majid <omajid at redhat.com> Mark
	Greenwood <mark at dcs.shef.ac.uk>

	 Fix PR638
	    * NEWS: Update with fix.
	    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (loadClass):
	Throw ClassNotFoundException instead of returning null.
	    * AUTHORS: Update.


diffstat:

4 files changed, 16 insertions(+)
AUTHORS                                                |    1 +
ChangeLog                                              |    9 +++++++++
NEWS                                                   |    2 ++
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |    4 ++++

diffs (53 lines):

diff -r d245772c7043 -r f14bd72dbb29 AUTHORS
--- a/AUTHORS	Tue Feb 22 15:11:31 2011 -0500
+++ b/AUTHORS	Tue Feb 22 19:15:05 2011 -0500
@@ -4,6 +4,7 @@ Lillian Angel <langel at redhat.com>
 Lillian Angel <langel at redhat.com>
 Deepak Bhole <dbhole at redhat.com>
 Thomas Fitzsimmons <fitzsim at redhat.com>
+Mark Greenwood <mark at dcs.shef.ac.uk>
 Andrew John Hughes <gnu_andrew at member.fsf.org, ahughes at redhat.com>
 Matthias Klose <doko at ubuntu.com>
 Francis Kung <fkung at redhat.com>
diff -r d245772c7043 -r f14bd72dbb29 ChangeLog
--- a/ChangeLog	Tue Feb 22 15:11:31 2011 -0500
+++ b/ChangeLog	Tue Feb 22 19:15:05 2011 -0500
@@ -1,3 +1,12 @@ 2011-02-22  Omair Majid  <omajid at redhat.
+2011-02-22  Omair Majid  <omajid at redhat.com>
+            Mark Greenwood <mark at dcs.shef.ac.uk>
+
+	Fix PR638
+	* NEWS: Update with fix.
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (loadClass): Throw
+	ClassNotFoundException instead of returning null.
+	* AUTHORS: Update.
+
 2011-02-22  Omair Majid  <omajid at redhat.com>
 
 	* Makefile.am (uninstall-local): Fix typo in PACKAGE_NAME.
diff -r d245772c7043 -r f14bd72dbb29 NEWS
--- a/NEWS	Tue Feb 22 15:11:31 2011 -0500
+++ b/NEWS	Tue Feb 22 19:15:05 2011 -0500
@@ -14,6 +14,8 @@ New in release 1.1 (2011-XX-XX):
   - RH677332, CVE-2011-0706: IcedTea multiple signers privilege escalation
 * New Features
   - IcedTea-Web now installs to a FHS-compliant location
+* Common Fixes and Improvements
+  - PR638: JNLPClassLoader.loadClass(String name) can return null
 * NetX
   - Use Firefox's proxy settings if possible
   - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled)
diff -r d245772c7043 -r f14bd72dbb29 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Feb 22 15:11:31 2011 -0500
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Feb 22 19:15:05 2011 -0500
@@ -1045,6 +1045,10 @@ public class JNLPClassLoader extends URL
                 }
             }
 
+        if (result == null) {
+            throw new ClassNotFoundException(name);
+        }
+
         return result;
     }