Skip to content

GUACAMOLE-2294: Address multiple minor resource leaks. #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
necouchman wants to merge 3 commits into
base: staging/1.6.1
Choose a base branch
from
+39 −25
Open

GUACAMOLE-2294: Address multiple minor resource leaks. #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbf31c4
GUACAMOLE-2294: Address multiple minor resource leaks.
necouchman Jul 5, 2026
caffa65
GUACAMOLE-2294: Reorganize config file reading to avoid resource leak.
necouchman Jul 5, 2026
c3180e3
GUACAMOLE-2294: Handle telnet regex settings leaks.
necouchman Jul 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/guacd/conf-file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,22 +197,23 @@ guacd_config* guacd_conf_load() {

/* Read configuration from file */
int fd = open(GUACD_CONF_FILE, O_RDONLY);
if (fd > 0) {

int retval = guacd_conf_parse_file(conf, fd);
close(fd);

if (retval != 0) {
fprintf(stderr, "Unable to parse \"" GUACD_CONF_FILE "\".\n");
guac_mem_free(conf);
return NULL;
}

}

/* Notify of errors preventing reading */
else if (errno != ENOENT) {
if (fd < 0 && errno != ENOENT) {
fprintf(stderr, "Unable to open \"" GUACD_CONF_FILE "\": %s\n", strerror(errno));
guac_mem_free(conf->bind_host);
guac_mem_free(conf->bind_port);
guac_mem_free(conf);
return NULL;
}

int retval = guacd_conf_parse_file(conf, fd);
close(fd);

if (retval != 0) {
fprintf(stderr, "Unable to parse \"" GUACD_CONF_FILE "\".\n");
guac_mem_free(conf->bind_host);
guac_mem_free(conf->bind_port);
guac_mem_free(conf);
return NULL;
}
Expand Down
30 changes: 18 additions & 12 deletions src/protocols/telnet/settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,11 @@ guac_telnet_settings* guac_telnet_parse_args(guac_user* user,

/* Read username regex only if username is specified */
if (settings->username != NULL) {
settings->username_regex = guac_telnet_compile_regex(user,
guac_user_parse_args_string(user, GUAC_TELNET_CLIENT_ARGS, argv,
IDX_USERNAME_REGEX, GUAC_TELNET_DEFAULT_USERNAME_REGEX));
char* username_regex = guac_user_parse_args_string(user,
GUAC_TELNET_CLIENT_ARGS, argv, IDX_USERNAME_REGEX,
GUAC_TELNET_DEFAULT_USERNAME_REGEX);
settings->username_regex = guac_telnet_compile_regex(user, username_regex);
guac_mem_free(username_regex);
}

/* Read password */
Expand All @@ -383,20 +385,24 @@ guac_telnet_settings* guac_telnet_parse_args(guac_user* user,

/* Read password regex only if password is specified */
if (settings->password != NULL) {
settings->password_regex = guac_telnet_compile_regex(user,
guac_user_parse_args_string(user, GUAC_TELNET_CLIENT_ARGS, argv,
IDX_PASSWORD_REGEX, GUAC_TELNET_DEFAULT_PASSWORD_REGEX));
char* password_regex = guac_user_parse_args_string(user,
GUAC_TELNET_CLIENT_ARGS, argv, IDX_PASSWORD_REGEX,
GUAC_TELNET_DEFAULT_PASSWORD_REGEX);
settings->password_regex = guac_telnet_compile_regex(user, password_regex);
guac_mem_free(password_regex);
}

/* Read optional login success detection regex */
settings->login_success_regex = guac_telnet_compile_regex(user,
guac_user_parse_args_string(user, GUAC_TELNET_CLIENT_ARGS, argv,
IDX_LOGIN_SUCCESS_REGEX, NULL));
char* login_success_regex = guac_user_parse_args_string(user,
GUAC_TELNET_CLIENT_ARGS, argv, IDX_LOGIN_SUCCESS_REGEX, NULL);
settings->login_success_regex = guac_telnet_compile_regex(user, login_success_regex);
guac_mem_free(login_success_regex);

/* Read optional login failure detection regex */
settings->login_failure_regex = guac_telnet_compile_regex(user,
guac_user_parse_args_string(user, GUAC_TELNET_CLIENT_ARGS, argv,
IDX_LOGIN_FAILURE_REGEX, NULL));
char* login_failure_regex = guac_user_parse_args_string(user,
GUAC_TELNET_CLIENT_ARGS, argv, IDX_LOGIN_FAILURE_REGEX, NULL);
settings->login_failure_regex = guac_telnet_compile_regex(user, login_failure_regex);
guac_mem_free(login_failure_regex);

/* Both login success and login failure regexes must be provided if either
* is present at all */
Expand Down
3 changes: 3 additions & 0 deletions src/terminal/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ guac_terminal_display* guac_terminal_display_alloc(guac_client* client,
if (guac_terminal_display_set_font(display, font_name, font_size, dpi)) {
guac_client_abort(display->client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
"Unable to set initial font \"%s\"", font_name);
guac_mem_free(display->display_layer);
guac_mem_free(display->display_surface);
guac_mem_free(display->select_layer);
guac_mem_free(display);
return NULL;
}
Expand Down
4 changes: 4 additions & 0 deletions src/terminal/terminal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,10 @@ guac_terminal* guac_terminal_create(guac_client* client,
/* Fail if display init failed */
if (term->display == NULL) {
guac_client_log(client, GUAC_LOG_DEBUG, "Display initialization failed");
guac_mem_free(term->alternate_buffer);
free((char *)(term->color_scheme));
guac_mem_free(term->current_buffer);
free((char *)(term->font_name));
guac_mem_free(term);
return NULL;
}
Expand Down
Loading