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/05/27 15:50:30 UTC
[3/6] guacamole-server git commit: GUACAMOLE-470: Fix crash when X11
color is not found.
GUACAMOLE-470: Fix crash when X11 color is not found.
Fix a crash when an X11 color name is not found. The variable to
null-check should be `found`, not `color`.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/03d9c51b
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/03d9c51b
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/03d9c51b
Branch: refs/heads/master
Commit: 03d9c51b5d3e15cac7148e8cc733af7ae8c9f6cc
Parents: 7e68901
Author: Jim Chen <nc...@mozilla.com>
Authored: Wed May 16 00:11:30 2018 -0400
Committer: Jim Chen <nc...@mozilla.com>
Committed: Sat May 26 23:18:27 2018 -0400
----------------------------------------------------------------------
src/terminal/named-colors.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/03d9c51b/src/terminal/named-colors.c
----------------------------------------------------------------------
diff --git a/src/terminal/named-colors.c b/src/terminal/named-colors.c
index 89deee8..b0e579b 100644
--- a/src/terminal/named-colors.c
+++ b/src/terminal/named-colors.c
@@ -786,7 +786,7 @@ int guac_terminal_find_color(const char* name, guac_terminal_color* color) {
guac_terminal_named_color_search);
/* Fail if no such color is found */
- if (color == NULL)
+ if (found == NULL)
return 1;
/* Otherwise copy the found color */