From eff951fddabb766b80ce413824de04a5a552209f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 30 Jan 2013 15:01:54 -0800 Subject: [PATCH] Properly check for null when checking system permissions. --- .../net/sourceforge/guacamole/net/basic/ConfigurationList.java | 2 +- .../main/java/net/sourceforge/guacamole/net/basic/UserList.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConfigurationList.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConfigurationList.java index 2e182ec02..ee01be4b0 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConfigurationList.java +++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConfigurationList.java @@ -168,7 +168,7 @@ public class ConfigurationList extends AuthenticatingHttpServlet { xml.writeStartElement("configs"); // Save config create permission attribute - if (hasConfigPermission(permissions, username, + if (permissions != null && hasConfigPermission(permissions, username, SystemPermission.Type.CREATE)) xml.writeAttribute("create", "yes"); diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/UserList.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/UserList.java index 7f478c227..d12a5ef99 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/UserList.java +++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/UserList.java @@ -152,7 +152,7 @@ public class UserList extends AuthenticatingHttpServlet { xml.writeStartElement("users"); // Save user create permission attribute - if (hasUserPermission(permissions, username, + if (permissions != null && hasUserPermission(permissions, username, SystemPermission.Type.CREATE)) xml.writeAttribute("create", "yes");