ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-02 01:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't strstr on null/blank strings.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7027 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris committed 2007-12-30 00:22:51 +00:00
1 parent 33bd22a308
commit 6c25cb4136
9 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/applications/mod_conference/mod_conference.c
+2 -2
View File
@@ -3498,9 +3498,9 @@ switch_status_t conf_api_dispatch(conference_obj_t * conference, switch_stream_h
const char *modified_cmdline = cmdline;
const char *cmd = conf_api_sub_commands[i].pname;
if ((start_text = strstr(modified_cmdline, cmd))) {
if (!switch_strlen_zero(modified_cmdline) && (start_text = strstr(modified_cmdline, cmd))) {
modified_cmdline = start_text + strlen(cmd);
while (modified_cmdline && *modified_cmdline && (*modified_cmdline == ' ' || *modified_cmdline == '\t')) {
while (modified_cmdline && (*modified_cmdline == ' ' || *modified_cmdline == '\t')) {
modified_cmdline++;
}
}
src/mod/endpoints/mod_portaudio/mod_portaudio.c
+1 -1
View File
@@ -1016,7 +1016,7 @@ static int get_dev_by_name(char *name, int in)
if (switch_strlen_zero(name)) {
match = 1;
} else if (strstr(pdi->name, name)) {
} else if (pdi && pdi->name && strstr(pdi->name, name)) {
match = 1;
}
src/mod/endpoints/mod_sofia/sofia_presence.c
+1 -1
View File
@@ -1275,7 +1275,7 @@ void sofia_presence_handle_sip_i_message(int status,
const char *subject = "n/a";
char *msg = NULL;
if (sip->sip_content_type) {
if (sip->sip_content_type && !switch_strlen_zero(sip->sip_content_type->c_subtype)) {
if (strstr(sip->sip_content_type->c_subtype, "composing")) {
return;
}
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+1 -1
View File
@@ -1027,7 +1027,7 @@ static switch_status_t load_modules(void)
if ((mods = switch_xml_child(cfg, "modules"))) {
for (ld = switch_xml_child(mods, "load"); ld; ld = ld->next) {
const char *val = switch_xml_attr_soft(ld, "module");
if (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) {
if (!switch_strlen_zero(val) && strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val);
continue;
}