/hg/release/icedtea-web-1.4: Fix potential NPE on GetValue message
adomurad at icedtea.classpath.org
adomurad at icedtea.classpath.org
Fri Jun 28 07:07:34 PDT 2013
changeset 6cd78e135d41 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=6cd78e135d41
author: Adam Domurad <adomurad at redhat.com>
date: Fri Jun 28 10:07:19 2013 -0400
Fix potential NPE on GetValue message
diffstat:
ChangeLog | 5 +++++
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
diffs (26 lines):
diff -r be23db7861a6 -r 6cd78e135d41 ChangeLog
--- a/ChangeLog Fri Jun 28 14:02:37 2013 +0200
+++ b/ChangeLog Fri Jun 28 10:07:19 2013 -0400
@@ -1,3 +1,8 @@
+2013-06-28 Adam Domurad <adomurad at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+ (handleMessage): Fix potential NPE on 'GetValue'
+
2013-06-24 Jiri Vanek <jvanek at redhat.com>
JNLP file is now re-downloading only if is local and have href
diff -r be23db7861a6 -r 6cd78e135d41 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Fri Jun 28 14:02:37 2013 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Fri Jun 28 10:07:19 2013 -0400
@@ -522,8 +522,9 @@
Integer index = parseCall(args[1], null, Integer.class);
Object ret = store.getObject(index);
+ Class<?> retClass = ret != null ? ret.getClass() : null;
- String objIDStr = toObjectIDString(ret, ret.getClass(), true /*unbox primitives*/);
+ String objIDStr = toObjectIDString(ret, retClass, true /*unbox primitives*/);
write(reference, "GetValue " + objIDStr);
} else if (message.startsWith("SetStaticField") ||
message.startsWith("SetField")) {
More information about the distro-pkg-dev
mailing list