- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8446 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: anthm Date: Fri May 16 13:29:22 2008 New Revision: 8446 Modified: freeswitch/trunk/src/switch_core_db.c Log: update Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Fri May 16 13:29:22 2008 @@ -96,7 +96,7 @@ if (errmsg) { *errmsg = err; - } else { + } else if (err) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s]\n", err); switch_core_db_free(err); err = NULL;

1 0

[commit] r8445 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 13:25:43 2008 New Revision: 8445 Modified: freeswitch/trunk/src/switch_event.c Log: handle edgecase leak on platforms without vasprintf. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri May 16 13:25:43 2008 @@ -863,11 +863,14 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - switch_assert(data); + if (!data) return NULL; ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) { +#ifndef HAVE_VASPRINTF + free(data); +#endif return NULL; } }

1 0

[commit] r8444 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 13:18:57 2008 New Revision: 8444 Modified: freeswitch/trunk/src/switch_event.c Log: remove redundant null check. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri May 16 13:18:57 2008 @@ -790,7 +790,7 @@ } } - switch_snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, switch_strlen_zero(encode_buf) ? "_undef_" : encode_buf); + switch_snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, *encode_buf == '\0' ? "_undef_" : encode_buf); len = strlen(buf); }

1 0

[commit] r8443 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 13:07:10 2008 New Revision: 8443 Modified: freeswitch/trunk/src/switch_event.c Log: don't leak after allocation failure. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri May 16 13:07:10 2008 @@ -734,6 +734,7 @@ /* go ahead and give ourselves some space to work with, should save a few reallocs */ if (!(encode_buf = malloc(encode_len))) { + switch_safe_free(buf); return SWITCH_STATUS_MEMERR; }

1 0

[commit] r8442 - freeswitch/trunk/w32/Library
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 13:06:27 2008 New Revision: 8442 Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Log: disable incorrect code analysis catch Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Fri May 16 13:06:27 2008 @@ -363,6 +363,14 @@ <File RelativePath="..\..\src\switch_core_session.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="6385" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\switch_core_speech.c"

1 0

[commit] r8441 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 12:59:34 2008 New Revision: 8441 Modified: freeswitch/trunk/src/switch_event.c Log: tweak asserts. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri May 16 12:59:34 2008 @@ -429,13 +429,15 @@ { switch_thread_t *thread; switch_threadattr_t *thd_attr;; + + switch_assert(pool != NULL); + switch_threadattr_create(&thd_attr, pool); switch_threadattr_detach_set(thd_attr, 1); gethostname(hostname, sizeof(hostname)); switch_find_local_ip(guess_ip_v4, sizeof(guess_ip_v4), AF_INET); switch_find_local_ip(guess_ip_v6, sizeof(guess_ip_v6), AF_INET6); - switch_assert(pool != NULL); THRUNTIME_POOL = RUNTIME_POOL = pool; switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL);

1 0

[commit] r8440 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: anthm Date: Fri May 16 12:43:47 2008 New Revision: 8440 Modified: freeswitch/trunk/src/switch_core_db.c freeswitch/trunk/src/switch_core_sqldb.c Log: handle error message leaks and other error conditions, Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Fri May 16 12:43:47 2008 @@ -96,6 +96,10 @@ if (errmsg) { *errmsg = err; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s]\n", err); + switch_core_db_free(err); + err = NULL; } return ret; Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Fri May 16 12:43:47 2008 @@ -71,9 +71,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL Retry [%s]\n", errmsg); } switch_core_db_free(errmsg); + errmsg = NULL; if (again) { - switch_core_db_exec(db, "end transaction", NULL, NULL, &errmsg); + switch_core_db_exec(db, "end transaction", NULL, NULL, NULL); goto again; } @@ -93,6 +94,7 @@ if (errmsg) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s]\n", errmsg); switch_core_db_free(errmsg); + errmsg = NULL; switch_yield(100000); retries--; if (retries == 0 && forever) { @@ -107,7 +109,7 @@ done: - switch_core_db_exec(db, "end transaction", NULL, NULL, &errmsg); + switch_core_db_exec(db, "end transaction", NULL, NULL, NULL); return status; } @@ -234,6 +236,8 @@ { char *sql = NULL; + switch_assert(event); + switch (event->event_id) { case SWITCH_EVENT_ADD_SCHEDULE: sql = switch_mprintf("insert into tasks values('%q','%q','%q','%q')", @@ -282,10 +286,14 @@ ); break; case SWITCH_EVENT_CHANNEL_STATE: - if (event) { + { char *state = switch_event_get_header_nil(event, "channel-state-number"); - switch_channel_state_t state_i = atoi(state); + switch_channel_state_t state_i = CS_DONE; + if (!switch_strlen_zero(state)) { + state_i = atoi(state); + } + switch (state_i) { case CS_HANGUP: case CS_DONE: @@ -300,18 +308,15 @@ switch_event_get_header_nil(event, "caller-destination-number"), switch_event_get_header_nil(event, "caller-dialplan"), switch_event_get_header_nil(event, "caller-context"), - switch_event_get_header_nil(event, "unique-id") - ); + switch_event_get_header_nil(event, "unique-id")); break; default: sql = switch_mprintf("update channels set state='%s' where uuid='%s'", - switch_event_get_header_nil(event, "channel-state"), switch_event_get_header_nil(event, "unique-id") - ); + switch_event_get_header_nil(event, "channel-state"), switch_event_get_header_nil(event, "unique-id")); break; } - + break; } - break; case SWITCH_EVENT_CHANNEL_BRIDGE: sql = switch_mprintf("insert into calls values ('%s', '%ld', '%s','%q','%q','%q','%q','%s','%q','%q','%q','%q','%s')", switch_event_get_header_nil(event, "event-date-local"),

1 0

[commit] r8439 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 12:15:37 2008 New Revision: 8439 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: don't pass null to switch_loadable_module_get_api_interface. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri May 16 12:15:37 2008 @@ -1349,7 +1349,7 @@ } } - if ((api = switch_loadable_module_get_api_interface(cmd)) != 0) { + if (cmd && (api = switch_loadable_module_get_api_interface(cmd)) != 0) { status = api->function(arg, session, stream); } else { status = SWITCH_STATUS_FALSE;

1 0

[commit] r8438 - freeswitch/trunk/src/include
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 11:53:48 2008 New Revision: 8438 Modified: freeswitch/trunk/src/include/switch_cpp.h Log: initialize allocated in constructors. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Fri May 16 11:53:48 2008 @@ -16,7 +16,7 @@ #define sanity_check(x) do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) #define sanity_check_noreturn do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return;}} while(0) -#define init_vars() do { session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; xml_cdr_text = NULL; memset(&args, 0, sizeof(args)); ap = NULL; caller_profile.source = "mod_unknown"; caller_profile.dialplan = ""; caller_profile.context = ""; caller_profile.caller_id_name = ""; caller_profile.caller_id_number = ""; caller_profile.network_addr = ""; caller_profile.ani = ""; caller_profile.aniii = ""; caller_profile.rdnis = ""; caller_profile.username = ""; on_hangup = NULL; memset(&cb_state, 0, sizeof(cb_state)); hook_state = CS_NEW; } while(0) +#define init_vars() do { allocated = 0; session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; xml_cdr_text = NULL; memset(&args, 0, sizeof(args)); ap = NULL; caller_profile.source = "mod_unknown"; caller_profile.dialplan = ""; caller_profile.context = ""; caller_profile.caller_id_name = ""; caller_profile.caller_id_number = ""; caller_profile.network_addr = ""; caller_profile.ani = ""; caller_profile.aniii = ""; caller_profile.rdnis = ""; caller_profile.username = ""; on_hangup = NULL; memset(&cb_state, 0, sizeof(cb_state)); hook_state = CS_NEW; } while(0) //

1 0

[commit] r8437 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 11:49:23 2008 New Revision: 8437 Modified: freeswitch/trunk/src/switch_core_state_machine.c Log: don't pass null to switch_loadable_module_get_dialplan_interface. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Fri May 16 11:49:23 2008 @@ -84,6 +84,8 @@ if ((dparg = strchr(dpname, ':'))) { *dparg++ = '\0'; } + } else { + continue; } if (!(dialplan_interface = switch_loadable_module_get_dialplan_interface(dpname))) { continue;

1 0