Skip to content

fix ziti_shutdown(): trying to logout sometimes lead to crashes #851

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

Merged
ekoby merged 1 commit into from
Apr 11, 2025
Merged

fix ziti_shutdown(): trying to logout sometimes lead to crashes #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion library/ziti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@

ziti_ctrl_cancel(ztx_get_controller(ztx));
// logout
ziti_ctrl_logout(ztx_get_controller(ztx), logout_cb, ztx);
ziti_ctrl_clear_api_session(ztx_get_controller(ztx));
update_ctrl_status(ztx, ZITI_DISABLED, ziti_errorstr(ZITI_DISABLED));
ztx->enabled = false;
}
Expand Down Expand Up @@ -1806,7 +1806,7 @@
id_it = model_list_it_remove(id_it);
}

MODEL_MAP_FOREACH(conn_id, conn, &ztx->connections) {

Check warning on line 1809 in library/ziti.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

comparison between pointer and integer ('uint32_t' (aka 'unsigned int') and 'void *') [-Wpointer-integer-compare]

Check warning on line 1809 in library/ziti.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

comparison between pointer and integer ('uint32_t' (aka 'unsigned int') and 'void *') [-Wpointer-integer-compare]
if (conn->type == Server) {
update_bindings(conn);
}
Expand Down
3 changes: 3 additions & 0 deletions library/ziti_ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,9 @@ static void on_http_close(tlsuv_http_t *clt) {
}

int ziti_ctrl_cancel(ziti_controller *ctrl) {
if (ctrl->client == NULL) {
return ZITI_OK;
}
return tlsuv_http_cancel_all(ctrl->client);
}

Expand Down
Loading