Mercurial > hg > release > icedtea-web-1.1
changeset 234:a962e87c78e8
PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest
2011-05-27 Omair Majid <omajid@redhat.com>
* NEWS: Update.
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
(getClassPathsFromManifest): Check for possible nulls and empty strings.
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Fri, 27 May 2011 12:53:15 -0400 |
| parents | aea73e8365fe |
| children | df4d263c8015 |
| files | ChangeLog NEWS netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |
| diffstat | 3 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 27 12:32:52 2011 -0400 +++ b/ChangeLog Fri May 27 12:53:15 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-27 Omair Majid <omajid@redhat.com> + + * NEWS: Update. + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (getClassPathsFromManifest): Check for possible nulls and empty strings. + 2011-05-26 Andrew Su <asu@redhat.com> * NEWS: Update.
--- a/NEWS Fri May 27 12:32:52 2011 -0400 +++ b/NEWS Fri May 27 12:53:15 2011 -0400 @@ -21,6 +21,7 @@ - PR497: Mercurial revision detection not very reliable - PR638: JNLPClassLoader.loadClass(String name) can return null - RH677772: NoSuchAlgorithmException using SSL/TLS in javaws + - PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest * NetX - Use Firefox's proxy settings if possible - The user's default browser (determined from xdg-open or $BROWSER) is used
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri May 27 12:32:52 2011 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri May 27 12:53:15 2011 -0400 @@ -1375,6 +1375,9 @@ if (mf != null) { // extract the Class-Path entries from the manifest and split them String classpath = mf.getMainAttributes().getValue("Class-Path"); + if (classpath == null || classpath.trim().length() == 0) { + return result; + } String[] paths = classpath.split(" +"); for (String path : paths) { if (path.trim().length() == 0) {