From f07181e2665605917f165a6b1b43bb3ba5bf1c63 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sun, 26 May 2013 09:54:39 +0000 Subject: [PATCH 1/2] Avoid using psession uninitialized in mod_fsk --- src/mod/applications/mod_fsk/mod_fsk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_fsk/mod_fsk.c b/src/mod/applications/mod_fsk/mod_fsk.c index da996fdba4..58df3c4831 100644 --- a/src/mod/applications/mod_fsk/mod_fsk.c +++ b/src/mod/applications/mod_fsk/mod_fsk.c @@ -370,7 +370,7 @@ SWITCH_STANDARD_APP(fsk_display_function) const char *cid_name, *cid_num; switch_channel_t *channel = switch_core_session_get_channel(session); switch_core_session_message_t *msg; - switch_core_session_t *psession, *usession = NULL; + switch_core_session_t *psession = NULL, *usession = NULL; char *flags = (char *) data; cid_name = switch_channel_get_variable(channel, "fsk_phone_name"); From a82878f7864d3f53e7ae094092d09bb486e90c70 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sun, 26 May 2013 10:57:07 +0000 Subject: [PATCH 2/2] Unsigned values are never less than zero --- src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c index a50616f708..76c259c5ec 100644 --- a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c +++ b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c @@ -603,12 +603,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_json_cdr_load) } } - if (globals.retries < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Retries is negative, setting to 0\n"); - globals.retries = 0; - } - - if (globals.retries && globals.delay <= 0) { + if (globals.retries && globals.delay) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Retries set but delay 0 setting to 5000ms\n"); globals.delay = 5000; }