retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-11225: [freeswitch-core] Crash in fs_cli #resolve

This commit is contained in:
Anthony Minessale 2018-07-09 20:02:13 +00:00 committed by Muteesa Fred
parent 8bacb4991d
commit bc3e1c9e7d
1 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/esl/fs_cli.c
View File

@ -89,7 +89,7 @@ static int pcount = 0;
static esl_handle_t *global_handle; static esl_handle_t *global_handle;
static cli_profile_t *global_profile; static cli_profile_t *global_profile;
static int running = 1; static int running = 1;
static int thread_running = 0; static int thread_running = 0, thread_up = 0, check_up = 0;
static char *filter_uuid; static char *filter_uuid;
static char *logfilter; static char *logfilter;
static int timeout = 0; static int timeout = 0;
@ -671,8 +671,10 @@ static void clear_line(void)
static void redisplay(void) static void redisplay(void)
{ {
esl_mutex_lock(MUTEX);
{
#ifdef HAVE_LIBEDIT #ifdef HAVE_LIBEDIT
#ifdef HAVE_DECL_EL_REFRESH #ifdef XHAVE_DECL_EL_REFRESH
#ifdef HAVE_EL_WSET #ifdef HAVE_EL_WSET
/* Current libedit versions don't implement EL_REFRESH in eln.c so /* Current libedit versions don't implement EL_REFRESH in eln.c so
* use the wide version instead. */ * use the wide version instead. */
@ -695,16 +697,19 @@ static void redisplay(void)
} }
{ {
int pos = (int)(lf->cursor - lf->buffer); int pos = (int)(lf->cursor - lf->buffer);
char s1[12], s2[12]; char s1[12], s2[12] = "";
putchar('\r'); putchar('\r');
snprintf(s1, sizeof(s1), "\033[%dC", bare_prompt_str_len); snprintf(s1, sizeof(s1), "\033[%dC", bare_prompt_str_len);
snprintf(s2, sizeof(s2), "\033[%dC", pos); if (pos) snprintf(s2, sizeof(s2), "\033[%dC", pos);
printf("%s%s",s1,s2); printf("%s%s",s1,s2);
} }
fflush(stdout); fflush(stdout);
#endif
#endif
}
esl_mutex_unlock(MUTEX);
return; return;
#endif
#endif
} }
static int output_printf(const char *fmt, ...) static int output_printf(const char *fmt, ...)
@ -726,6 +731,9 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
{ {
esl_handle_t *handle = (esl_handle_t *) obj; esl_handle_t *handle = (esl_handle_t *) obj;
thread_running = 1; thread_running = 1;
esl_mutex_lock(MUTEX);
thread_up = 1;
esl_mutex_unlock(MUTEX);
while(thread_running && handle->connected) { while(thread_running && handle->connected) {
int aok = 1; int aok = 1;
esl_status_t status; esl_status_t status;
@ -846,6 +854,10 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
} }
//sleep_ms(1); //sleep_ms(1);
} }
esl_mutex_lock(MUTEX);
thread_up = 0;
esl_mutex_unlock(MUTEX);
thread_running = 0; thread_running = 0;
esl_log(ESL_LOG_DEBUG, "Thread Done\n"); esl_log(ESL_LOG_DEBUG, "Thread Done\n");
return NULL; return NULL;
@ -1165,7 +1177,9 @@ static unsigned char esl_console_complete(const char *buffer, const char *cursor
snprintf(cmd_str, sizeof(cmd_str), "api console_complete %s\n\n", buf); snprintf(cmd_str, sizeof(cmd_str), "api console_complete %s\n\n", buf);
} }
esl_mutex_lock(MUTEX);
esl_send_recv(global_handle, cmd_str); esl_send_recv(global_handle, cmd_str);
esl_mutex_unlock(MUTEX);
if (global_handle->last_sr_event && global_handle->last_sr_event->body) { if (global_handle->last_sr_event && global_handle->last_sr_event->body) {
char *r = global_handle->last_sr_event->body; char *r = global_handle->last_sr_event->body;
@ -1828,6 +1842,7 @@ int main(int argc, char *argv[])
output_printf("%s\n", handle.last_sr_reply); output_printf("%s\n", handle.last_sr_reply);
while (running > 0) { while (running > 0) {
int r; int r;
#ifdef HAVE_LIBEDIT #ifdef HAVE_LIBEDIT
if (!(global_profile->batch_mode)) { if (!(global_profile->batch_mode)) {
line = el_gets(el, &count); line = el_gets(el, &count);
@ -1869,6 +1884,13 @@ int main(int argc, char *argv[])
global_handle = NULL; global_handle = NULL;
thread_running = 0; thread_running = 0;
do {
esl_mutex_lock(MUTEX);
check_up = thread_up;
esl_mutex_unlock(MUTEX);
sleep_ms(10);
} while (check_up > 0);
esl_mutex_destroy(&MUTEX); esl_mutex_destroy(&MUTEX);
return 0; return 0;