# HG changeset patch
# User Adam Domurad <adomurad@redhat.com>
# Date 1372428439 14400
# Node ID 6cd78e135d4181d38bcdcb1c29b39b361bda1923
# Parent  be23db7861a6371608b64e5dfc4d86179a481bca
Fix potential NPE on GetValue message

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@redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+	(handleMessage): Fix potential NPE on 'GetValue'
+
 2013-06-24  Jiri Vanek <jvanek@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")) {