You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/04/13 18:46:45 UTC
[1/2] guacamole-server git commit: GUACAMOLE-482: Ignore invalid
instructions within guacenc. Log failure at debug level.
Repository: guacamole-server
Updated Branches:
refs/heads/master 325c8061e -> b61a6ab75
GUACAMOLE-482: Ignore invalid instructions within guacenc. Log failure at debug level.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/8d43c434
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/8d43c434
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/8d43c434
Branch: refs/heads/master
Commit: 8d43c4344d8db0e92bd505882756288792248c8e
Parents: 70b2b8a
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Apr 12 15:07:45 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Apr 12 15:07:45 2018 -0700
----------------------------------------------------------------------
src/guacenc/encode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/8d43c434/src/guacenc/encode.c
----------------------------------------------------------------------
diff --git a/src/guacenc/encode.c b/src/guacenc/encode.c
index 2d74a9b..3de9d79 100644
--- a/src/guacenc/encode.c
+++ b/src/guacenc/encode.c
@@ -65,8 +65,8 @@ static int guacenc_read_instructions(guacenc_display* display,
while (!guac_parser_read(parser, socket, -1)) {
if (guacenc_handle_instruction(display, parser->opcode,
parser->argc, parser->argv)) {
- guac_parser_free(parser);
- return 1;
+ guacenc_log(GUAC_LOG_DEBUG, "Handling of \"%s\" instruction "
+ "failed.", parser->opcode);
}
}
[2/2] guacamole-server git commit: GUACAMOLE-482: Merge allow
encoding to proceed despite invalid instructions.
Posted by vn...@apache.org.
GUACAMOLE-482: Merge allow encoding to proceed despite invalid instructions.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/b61a6ab7
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/b61a6ab7
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/b61a6ab7
Branch: refs/heads/master
Commit: b61a6ab758177b4d4cec4a3a0a2f51a3e76c3772
Parents: 325c806 8d43c43
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Apr 13 14:46:01 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Apr 13 14:46:01 2018 -0400
----------------------------------------------------------------------
src/guacenc/encode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------