GUCAMOLE-149: Merge zero-width character fix for potential infinite loop.
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/4da4ce72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4da4ce72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4da4ce72 Branch: refs/heads/master Commit: 4da4ce727918e346306e88880e29154be62c9b63 Parents: 09c493b a6e3f19 Author: James Muehlner <[email protected]> Authored: Wed Feb 1 10:14:53 2017 -0800 Committer: James Muehlner <[email protected]> Committed: Wed Feb 1 10:17:43 2017 -0800 ---------------------------------------------------------------------- src/terminal/buffer.c | 4 ++++ src/terminal/display.c | 4 ++++ src/terminal/terminal.c | 21 ++++++++++++--------- 3 files changed, 20 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
