/hg/icedtea-web: Check for nulls in JNLPPolicy.isSystemJar

[omajid at icedtea.classpath.org]

changeset 11696140595f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=11696140595f
author: Omair Majid <omajid at redhat.com>
date: Tue Mar 01 18:22:17 2011 -0500

	Check for nulls in JNLPPolicy.isSystemJar

	It is possible to have CodeSource.getLocation() return null. For
	example, sun.applet.AppletPanel (line 1071) queries the policy using
	a null Location p.getPermissions(new CodeSource(null,
	(java.security.cert.Certificate[]) null))

	2011-03-01 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java
	(isSystemJar): Check for nulls.


diffstat:

2 files changed, 6 insertions(+)
ChangeLog                                         |    4 ++++
netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java |    2 ++

diffs (26 lines):

diff -r 738c9c852dda -r 11696140595f ChangeLog
--- a/ChangeLog	Tue Mar 01 11:55:31 2011 -0500
+++ b/ChangeLog	Tue Mar 01 18:22:17 2011 -0500
@@ -1,3 +1,8 @@ 2011-03-01  Andrew Su  <asu at redhat.com>
+2011-03-01  Omair Majid  <omajid at redhat.com>
+
+	 * netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java (isSystemJar): Check
+	 for nulls.
+
 2011-03-01  Andrew Su  <asu at redhat.com>
 
 	* netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
diff -r 738c9c852dda -r 11696140595f netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java	Tue Mar 01 11:55:31 2011 -0500
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java	Tue Mar 01 18:22:17 2011 -0500
@@ -137,6 +137,10 @@ public class JNLPPolicy extends Policy {
      * it's part of the JRE.
      */
     private boolean isSystemJar(CodeSource source) {
+        if (source == null || source.getLocation() == null) {
+            return false;
+        }
+
         // anything in JRE/lib/ext is a system jar and has full permissions
         String sourceProtocol = source.getLocation().getProtocol();
         String sourcePath = source.getLocation().getPath();