maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-400: Merge changes correcting segfault when an SSH private key cannot be imported.

Browse Source
This commit is contained in:
Michael Jumper 2017-09-29 12:05:56 -07:00
commit d35cc7a83e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/protocols/ssh/ssh.c
View File

@ -63,7 +63,8 @@
* terminal to use when prompting the user. * terminal to use when prompting the user.
* *
* @return * @return
* A new user object containing the user's username and other credentials. * A new user object containing the user's username and other credentials,
* or NULL if fails to import key.
*/ */
static guac_common_ssh_user* guac_ssh_get_user(guac_client* client) { static guac_common_ssh_user* guac_ssh_get_user(guac_client* client) {
@ -215,6 +216,10 @@ void* ssh_client_thread(void* data) {
/* Get user and credentials */ /* Get user and credentials */
ssh_client->user = guac_ssh_get_user(client); ssh_client->user = guac_ssh_get_user(client);
if (ssh_client->user == NULL) {
/* Already aborted within guac_ssh_get_user() */
return NULL;
}
/* Open SSH session */ /* Open SSH session */
ssh_client->session = guac_common_ssh_create_session(client, ssh_client->session = guac_common_ssh_create_session(client,