/hg/icedtea-web: Fix potential NPE on GetValue message

[adomurad at icedtea.classpath.org]

changeset 87c9fc859a21 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=87c9fc859a21
author: Adam Domurad <adomurad at redhat.com>
date: Fri Jun 28 09:45:11 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 244ea962a635 -r 87c9fc859a21 ChangeLog
--- a/ChangeLog	Thu Jun 27 09:55:18 2013 +0200
+++ b/ChangeLog	Fri Jun 28 09:45:11 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-25  Jiri Vanek <jvanek at redhat.com>
 
 	* acinclude.m4: (IT_CHECK_FOR_TAGSOUP) is now correctly setting
diff -r 244ea962a635 -r 87c9fc859a21 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java	Thu Jun 27 09:55:18 2013 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java	Fri Jun 28 09:45:11 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")) {