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

GUACAMOLE-222: Ensure files downloaded via SFTP are explicitly closed upon completion.

Browse Source
This commit is contained in:
Michael Jumper 2016-11-04 20:44:45 -07:00
parent 077cc84d27
commit 58b85da8f2
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common-ssh/guac_sftp.c
View File

@ -373,18 +373,29 @@ static int guac_common_ssh_sftp_ack_handler(guac_user* user,
} }
/* If EOF, send end */ /* If bytes could not be read, handle EOF or error condition */
else if (bytes_read == 0) {
guac_user_log(user, GUAC_LOG_DEBUG, "File sent");
guac_protocol_send_end(user->socket, stream);
guac_user_free_stream(user, stream);
}
/* Otherwise, fail stream */
else { else {
guac_user_log(user, GUAC_LOG_INFO, "Error reading file");
guac_protocol_send_end(user->socket, stream); /* If EOF, send end */
guac_user_free_stream(user, stream); if (bytes_read == 0) {
guac_user_log(user, GUAC_LOG_DEBUG, "File sent");
guac_protocol_send_end(user->socket, stream);
guac_user_free_stream(user, stream);
}
/* Otherwise, fail stream */
else {
guac_user_log(user, GUAC_LOG_INFO, "Error reading file");
guac_protocol_send_end(user->socket, stream);
guac_user_free_stream(user, stream);
}
/* Close file */
if (libssh2_sftp_close(file) == 0)
guac_user_log(user, GUAC_LOG_DEBUG, "File closed");
else
guac_user_log(user, GUAC_LOG_INFO, "Unable to close file");
} }
guac_socket_flush(user->socket); guac_socket_flush(user->socket);