You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/04/02 19:20:44 UTC

[11/23] guacamole-server git commit: GUACAMOLE-269: Backspace key should send null-terminated string.

GUACAMOLE-269: Backspace key should send null-terminated string.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/dd78d230
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/dd78d230
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/dd78d230

Branch: refs/heads/master
Commit: dd78d230eae38f8063683f2c9335abdb6af664d3
Parents: c286668
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Feb 27 09:35:29 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Mar 8 10:48:22 2018 -0500

----------------------------------------------------------------------
 src/terminal/terminal.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/dd78d230/src/terminal/terminal.c
----------------------------------------------------------------------
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index 0dae5cc..35810dc 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -1599,7 +1599,12 @@ static int __guac_terminal_send_key(guac_terminal* term, int keysym, int pressed
         /* Non-printable keys */
         else {
 
-            if (keysym == 0xFF08) return guac_terminal_send_string(term, &term->backspace); /* Backspace */
+            if (keysym == 0xFF08) {
+                char* backspace_str = malloc(sizeof(char) * 2);
+                backspace_str[0] = term->backspace;
+                backspace_str[1] = '\0';
+                return guac_terminal_send_string(term, backspace_str); /* Backspace */
+            }
             if (keysym == 0xFF09 || keysym == 0xFF89) return guac_terminal_send_string(term, "\x09"); /* Tab */
             if (keysym == 0xFF0D || keysym == 0xFF8D) return guac_terminal_send_string(term, "\x0D"); /* Enter */
             if (keysym == 0xFF1B) return guac_terminal_send_string(term, "\x1B"); /* Esc */