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

Proper handling of cursor reset. Clear argv[] when done.

Browse Source
This commit is contained in:
Michael Jumper 2011-08-05 14:39:11 -07:00
parent 8892c018e0
commit adb59fe341
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protocols/ssh/src/ssh_terminal_handlers.c
View File

@ -151,7 +151,7 @@ int ssh_guac_terminal_csi(ssh_guac_terminal* term, char c) {
/* CSI function arguments */ /* CSI function arguments */
static int argc = 0; static int argc = 0;
static int argv[16]; static int argv[16] = {0};
/* Argument building counter and buffer */ /* Argument building counter and buffer */
static int argv_length = 0; static int argv_length = 0;
@ -173,7 +173,7 @@ int ssh_guac_terminal_csi(ssh_guac_terminal* term, char c) {
/* Any non-digit stops the parameter, and possibly the sequence */ /* Any non-digit stops the parameter, and possibly the sequence */
else { else {
int i; int i, row, col;
/* At most 16 parameters */ /* At most 16 parameters */
if (argc < 16) { if (argc < 16) {
@ -259,8 +259,12 @@ int ssh_guac_terminal_csi(ssh_guac_terminal* term, char c) {
/* H: Move cursor */ /* H: Move cursor */
case 'H': case 'H':
term->cursor_row = argv[0] - 1;
term->cursor_col = argv[1] - 1; row = argv[0]; if (row != 0) row--;
col = argv[1]; if (col != 0) col--;
term->cursor_row = row;
term->cursor_col = col;
break; break;
/* J: Erase display */ /* J: Erase display */
@ -326,6 +330,10 @@ int ssh_guac_terminal_csi(ssh_guac_terminal* term, char c) {
if (c != ';') { if (c != ';') {
term->char_handler = ssh_guac_terminal_echo; term->char_handler = ssh_guac_terminal_echo;
/* Reset parameters */
for (i=0; i<argc; i++)
argv[i] = 0;
/* Reset argument counters */ /* Reset argument counters */
argc = 0; argc = 0;
argv_length = 0; argv_length = 0;