safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 21:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible NPE in MonitoringGuacamoleReader read() and readInstruction().

Browse Source
This commit is contained in:
Michael Jumper
2014-03-06 10:42:25 -08:00
parent 4851ba8b5c
commit e4f67e5aff
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/MonitoringGuacamoleReader.java
View File

@@ -66,13 +66,23 @@ public class MonitoringGuacamoleReader implements GuacamoleReader {
@Override @Override
public char[] read() throws GuacamoleException { public char[] read() throws GuacamoleException {
return readInstruction().toString().toCharArray();
// Read single instruction, handle end-of-stream
GuacamoleInstruction instruction = readInstruction();
if (instruction == null)
return null;
return instruction.toString().toCharArray();
} }
@Override @Override
public GuacamoleInstruction readInstruction() throws GuacamoleException { public GuacamoleInstruction readInstruction() throws GuacamoleException {
// Read single instruction, handle end-of-stream
GuacamoleInstruction instruction = reader.readInstruction(); GuacamoleInstruction instruction = reader.readInstruction();
if (instruction == null)
return null;
// If clipboard changed, notify listeners // If clipboard changed, notify listeners
if (instruction.getOpcode().equals("clipboard")) { if (instruction.getOpcode().equals("clipboard")) {