safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-05 20:57:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE if end-of-stream encountered during handshake (fixes #195).

Browse Source
This commit is contained in:
Michael Jumper
2012-10-03 10:27:53 -07:00
parent ed4dd27a05
commit 13db41f704
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java
View File

@@ -40,6 +40,7 @@ package net.sourceforge.guacamole.protocol;
import net.sourceforge.guacamole.io.GuacamoleReader;
import net.sourceforge.guacamole.io.GuacamoleWriter;
import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.GuacamoleServerException;
import net.sourceforge.guacamole.net.GuacamoleSocket;
import net.sourceforge.guacamole.protocol.GuacamoleInstruction.Operation;
@@ -86,7 +87,12 @@ public class ConfiguredGuacamoleSocket implements GuacamoleSocket {
// Wait for server args
GuacamoleInstruction instruction;
do {
// Read instruction, fail if end-of-stream
instruction = reader.readInstruction();
if (instruction == null)
throw new GuacamoleServerException("End of stream during initial handshake.");
} while (instruction.getOperation() != Operation.SERVER_ARGS);
// Build args list off provided names and config