From c95391f23ccc30e7d495a16ef927846dab96984a Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 15 Jan 2015 12:09:40 +0000 Subject: res_pjsip_outbound_registration: Fix race condition when reloading and listing registrations. Due to the split of outbound registration state from configuration it is possible during a reload for a "pjsip show registrations" CLI command to be executed which gets an older snapshot of the configuration. This configuration may include outbound registrations which have been removed due to a reload operation occurring at the same time. The code for printing the outbound registration did not take this into account but now it does. AST-1506 #close Review: https://reviewboard.asterisk.org/r/4338/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@430664 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_pjsip_outbound_registration.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'res/res_pjsip_outbound_registration.c') diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c index b06e3d33a..aac0eb1f9 100644 --- a/res/res_pjsip_outbound_registration.c +++ b/res/res_pjsip_outbound_registration.c @@ -1422,6 +1422,10 @@ static int cli_print_body(void *obj, void *arg, int flags) ast_assert(context->output_buffer != NULL); + if (!state) { + return 0; + } + ast_str_append(&context->output_buffer, 0, " %-s/%-*.*s %-16s %-16s\n", id, (int) (REGISTRATION_URI_FIELD_LEN - strlen(id)), -- cgit v1.2.3