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

GUACAMOLE-573: Read selection only within bounds of terminal/scrollback.

Browse Source
This commit is contained in:
Michael Jumper 2018-06-16 23:36:01 -07:00
parent 1756c01522
commit ecda5c1df9
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/terminal/select.c
View File

@ -149,6 +149,12 @@ static int guac_terminal_find_char(guac_terminal* terminal,
int start_column = *column; int start_column = *column;
/* If requested row is outside the bounds of the current terminal or
* scrollback, assume the character is 1 column wide */
if (row >= terminal->term_height
|| row < terminal->term_height - terminal->buffer->length)
return 1;
guac_terminal_buffer_row* buffer_row = guac_terminal_buffer_get_row(terminal->buffer, row, 0); guac_terminal_buffer_row* buffer_row = guac_terminal_buffer_get_row(terminal->buffer, row, 0);
if (start_column < buffer_row->length) { if (start_column < buffer_row->length) {
@ -276,7 +282,8 @@ void guac_terminal_select_resume(guac_terminal* terminal, int row, int column) {
* @param end * @param end
* The last column of the text to be copied from the given row into the * The last column of the text to be copied from the given row into the
* clipboard associated with the given terminal, where 0 is the first * clipboard associated with the given terminal, where 0 is the first
* (left-most) column within the row. * (left-most) column within the row, or a negative value to denote that
* the last column in the row should be used.
*/ */
static void guac_terminal_clipboard_append_row(guac_terminal* terminal, static void guac_terminal_clipboard_append_row(guac_terminal* terminal,
int row, int start, int end) { int row, int start, int end) {
@ -284,16 +291,22 @@ static void guac_terminal_clipboard_append_row(guac_terminal* terminal,
char buffer[1024]; char buffer[1024];
int i = start; int i = start;
/* If requested row is outside the bounds of the current terminal or
* scrollback, do nothing */
if (row >= terminal->term_height
|| row < terminal->term_height - terminal->buffer->length)
return;
guac_terminal_buffer_row* buffer_row = guac_terminal_buffer_row* buffer_row =
guac_terminal_buffer_get_row(terminal->buffer, row, 0); guac_terminal_buffer_get_row(terminal->buffer, row, 0);
/* If selection is entirely outside the bounds of the row, then there is /* If selection is entirely outside the bounds of the row, then there is
* nothing to append */ * nothing to append */
if (start > buffer_row->length - 1) if (start < 0 || start > buffer_row->length - 1)
return; return;
/* Clip given range to actual bounds of row */ /* Clip given range to actual bounds of row */
if (end == -1 || end > buffer_row->length - 1) if (end < 0 || end > buffer_row->length - 1)
end = buffer_row->length - 1; end = buffer_row->length - 1;
/* Repeatedly convert chunks of terminal buffer rows until entire specified /* Repeatedly convert chunks of terminal buffer rows until entire specified