[6/9] incubator-guacamole-server git commit: GUACAMOLE-278: Ignore 256-color SGR sequences which contain out-of-range values.

[jm...@apache.org]

GUACAMOLE-278: Ignore 256-color SGR sequences which contain out-of-range values.


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

Branch: refs/heads/master
Commit: e4ce7b0eeb07b326b4fec013fcee9e90f72b0b6f
Parents: 19f7424
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Apr 23 13:36:46 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Apr 23 13:52:08 2017 -0700

----------------------------------------------------------------------
 src/terminal/terminal_handlers.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/e4ce7b0e/src/terminal/terminal_handlers.c
----------------------------------------------------------------------
diff --git a/src/terminal/terminal_handlers.c b/src/terminal/terminal_handlers.c
index 7f7aee8..defca4b 100644
--- a/src/terminal/terminal_handlers.c
+++ b/src/terminal/terminal_handlers.c
@@ -461,10 +461,21 @@ static int guac_terminal_parse_xterm256_rgb(int argc, const int* argv,
     if (argc < 3)
         return 0;
 
+    /* Read RGB components from arguments */
+    int red   = argv[0];
+    int green = argv[1];
+    int blue  = argv[2];
+
+    /* Ignore if components are out of range */
+    if (   red   < 0 || red   > 255
+        || green < 0 || green > 255
+        || blue  < 0 || blue  > 255)
+        return 3;
+
     /* Store RGB components */
-    color->red   = (uint8_t) argv[0];
-    color->green = (uint8_t) argv[1];
-    color->blue  = (uint8_t) argv[2];
+    color->red   = (uint8_t) red;
+    color->green = (uint8_t) green;
+    color->blue  = (uint8_t) blue;
 
     /* Color is not from the palette */
     color->palette_index = -1;
@@ -491,7 +502,7 @@ static int guac_terminal_parse_xterm256_rgb(int argc, const int* argv,
  *
  * @return
  *     The number of arguments parsed, or zero if the palette index is
- *     out of range or absent.
+ *     absent.
  */
 static int guac_terminal_parse_xterm256_index(int argc, const int* argv,
         guac_terminal_color* color) {
@@ -500,10 +511,10 @@ static int guac_terminal_parse_xterm256_index(int argc, const int* argv,
     if (argc < 1)
         return 0;
 
-    /* Verify palette index bounds */
+    /* Ignore if palette index is out of bounds */
     int index = argv[0];
     if (index < 0 || index > 255)
-        return 0;
+        return 1;
 
     /* Copy palette entry */
     *color = guac_terminal_palette[index];