kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CID:1214218 fix memory leak in conference_event_channel_handler

This commit is contained in:
Michael Jerris 2014-05-15 12:33:15 +00:00
parent 622cd21009
commit 19f3ab5182
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1302,7 +1302,8 @@ static void conference_event_channel_handler(const char *event_channel, cJSON *j
conference_obj_t *conference = NULL; conference_obj_t *conference = NULL;
cJSON *data, *reply = NULL, *conf_desc = NULL; cJSON *data, *reply = NULL, *conf_desc = NULL;
const char *action = NULL; const char *action = NULL;
char *dup = NULL;
if ((data = cJSON_GetObjectItem(json, "data"))) { if ((data = cJSON_GetObjectItem(json, "data"))) {
action = cJSON_GetObjectCstr(data, "action"); action = cJSON_GetObjectCstr(data, "action");
} }
@ -1313,9 +1314,9 @@ static void conference_event_channel_handler(const char *event_channel, cJSON *j
cJSON_DeleteItemFromObject(reply, "data"); cJSON_DeleteItemFromObject(reply, "data");
if ((name = strchr(event_channel, '.'))) { if ((name = strchr(event_channel, '.'))) {
char *tmp = strdup(name + 1); dup = strdup(name + 1);
switch_assert(tmp); switch_assert(dup);
name = tmp; name = dup;
if ((domain = strchr(name, '@'))) { if ((domain = strchr(name, '@'))) {
*domain++ = '\0'; *domain++ = '\0';
@ -1341,8 +1342,9 @@ static void conference_event_channel_handler(const char *event_channel, cJSON *j
cJSON_AddItemToObject(reply, "data", conf_desc); cJSON_AddItemToObject(reply, "data", conf_desc);
switch_safe_free(dup);
switch_event_channel_broadcast(event_channel, &reply, modname, globals.event_channel_id); switch_event_channel_broadcast(event_channel, &reply, modname, globals.event_channel_id);
} }