Repository: incubator-guacamole-server Updated Branches: refs/heads/master 99e6f89eb -> c5f674340
GUACAMOLE-383: resolve issues identified by cppcheck [src/guacd/conf-file.c:206]: (error) Memory leak: conf [src/protocols/rdp/rdp_cliprdr.c:205]: (error) Memory leak: output [src/terminal/display.c:283]: (error) Memory leak: display [src/terminal/display.c:290]: (error) Memory leak: display 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/fc071fd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/fc071fd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/fc071fd1 Branch: refs/heads/master Commit: fc071fd1afca5add3e341e80a11635756e86b7b3 Parents: 99e6f89 Author: Ilya Shipitsin <[email protected]> Authored: Wed Sep 20 22:55:58 2017 +0500 Committer: Ilya Shipitsin <[email protected]> Committed: Wed Sep 20 22:55:58 2017 +0500 ---------------------------------------------------------------------- src/guacd/conf-file.c | 1 + src/protocols/rdp/rdp_cliprdr.c | 1 + src/terminal/display.c | 2 ++ 3 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fc071fd1/src/guacd/conf-file.c ---------------------------------------------------------------------- diff --git a/src/guacd/conf-file.c b/src/guacd/conf-file.c index ba32c78..f80948a 100644 --- a/src/guacd/conf-file.c +++ b/src/guacd/conf-file.c @@ -203,6 +203,7 @@ guacd_config* guacd_conf_load() { /* Notify of errors preventing reading */ else if (errno != ENOENT) { fprintf(stderr, "Unable to open \"" GUACD_CONF_FILE "\": %s\n", strerror(errno)); + free(conf); return NULL; } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fc071fd1/src/protocols/rdp/rdp_cliprdr.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_cliprdr.c b/src/protocols/rdp/rdp_cliprdr.c index 647ddda..5301911 100644 --- a/src/protocols/rdp/rdp_cliprdr.c +++ b/src/protocols/rdp/rdp_cliprdr.c @@ -202,6 +202,7 @@ void guac_rdp_process_cb_data_request(guac_client* client, default: guac_client_log(client, GUAC_LOG_ERROR, "Server requested unsupported clipboard data type"); + free(output); return; } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fc071fd1/src/terminal/display.c ---------------------------------------------------------------------- diff --git a/src/terminal/display.c b/src/terminal/display.c index fff61d1..3ad1cba 100644 --- a/src/terminal/display.c +++ b/src/terminal/display.c @@ -280,6 +280,7 @@ guac_terminal_display* guac_terminal_display_alloc(guac_client* client, font = pango_font_map_load_font(font_map, context, display->font_desc); if (font == NULL) { guac_client_abort(display->client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, "Unable to get font \"%s\"", font_name); + free(display); return NULL; } @@ -287,6 +288,7 @@ guac_terminal_display* guac_terminal_display_alloc(guac_client* client, if (metrics == NULL) { guac_client_abort(display->client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, "Unable to get font metrics for font \"%s\"", font_name); + free(display); return NULL; }
