kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-18 14:55:58 +00:00
Code Issues Projects Releases Wiki Activity

[mod_kazoo] Coverity CID 1468146 (Resource leak)

Browse Source
This commit is contained in:
Jakub Karolczyk 2023-04-13 20:19:18 +01:00
parent 8f8850c75b
commit 1464f1b1e7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mod/event_handlers/mod_kazoo/kazoo_message.c
View File

@ -233,9 +233,11 @@ cJSON * kazoo_event_add_field_to_json(cJSON *dst, switch_event_t *src, kazoo_fie
} else if((header = switch_event_get_header_ptr(src, field->name)) != NULL) { } else if((header = switch_event_get_header_ptr(src, field->name)) != NULL) {
if (header->idx) { if (header->idx) {
item = cJSON_CreateArray(); item = cJSON_CreateArray();
for(i = 0; i < header->idx; i++) { for(i = 0; i < header->idx; i++) {
cJSON_AddItemToArray(item, kazoo_event_json_value(field->out_type, header->array[i])); cJSON_AddItemToArray(item, kazoo_event_json_value(field->out_type, header->array[i]));
} }
kazoo_cJSON_AddItemToObject(dst, field->as ? field->as : field->name, item); kazoo_cJSON_AddItemToObject(dst, field->as ? field->as : field->name, item);
} else if (field->out_type_as_array) { } else if (field->out_type_as_array) {
item = cJSON_CreateArray(); item = cJSON_CreateArray();
@ -251,13 +253,13 @@ cJSON * kazoo_event_add_field_to_json(cJSON *dst, switch_event_t *src, kazoo_fie
expanded = kz_event_expand_headers(src, field->value); expanded = kz_event_expand_headers(src, field->value);
if(expanded != NULL && !zstr(expanded)) { if(expanded != NULL && !zstr(expanded)) {
item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, expanded); item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, expanded);
if(expanded != field->value) {
free(expanded);
}
} }
switch_safe_free(expanded);
break; break;
case FIELD_FIRST_OF: case FIELD_FIRST_OF:
for(n = 0; n < field->list.size; n++) { for(n = 0; n < field->list.size; n++) {
if(*field->list.value[n] == '#') { if(*field->list.value[n] == '#') {
item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, ++field->list.value[n]); item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, ++field->list.value[n]);
@ -267,33 +269,41 @@ cJSON * kazoo_event_add_field_to_json(cJSON *dst, switch_event_t *src, kazoo_fie
if(header) { if(header) {
if (header->idx) { if (header->idx) {
item = cJSON_CreateArray(); item = cJSON_CreateArray();
for(i = 0; i < header->idx; i++) { for(i = 0; i < header->idx; i++) {
cJSON_AddItemToArray(item, kazoo_event_json_value(field->out_type, header->array[i])); cJSON_AddItemToArray(item, kazoo_event_json_value(field->out_type, header->array[i]));
} }
kazoo_cJSON_AddItemToObject(dst, field->as ? field->as : field->name, item); kazoo_cJSON_AddItemToObject(dst, field->as ? field->as : field->name, item);
} else { } else {
item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, header->value); item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, header->value);
} }
break; break;
} }
} }
} }
break; break;
case FIELD_PREFIX: case FIELD_PREFIX:
for (header = src->headers; header; header = header->next) { for (header = src->headers; header; header = header->next) {
if(!strncmp(header->name, field->name, strlen(field->name))) { if(!strncmp(header->name, field->name, strlen(field->name))) {
if (header->idx) { if (header->idx) {
cJSON *array = cJSON_CreateArray(); cJSON *array = cJSON_CreateArray();
for(i = 0; i < header->idx; i++) { for(i = 0; i < header->idx; i++) {
cJSON_AddItemToArray(array, kazoo_event_json_value(field->out_type, header->array[i])); cJSON_AddItemToArray(array, kazoo_event_json_value(field->out_type, header->array[i]));
} }
kazoo_cJSON_AddItemToObject(dst, field->exclude_prefix ? header->name+strlen(field->name) : header->name, array); kazoo_cJSON_AddItemToObject(dst, field->exclude_prefix ? header->name+strlen(field->name) : header->name, array);
} else { } else {
kazoo_event_add_json_value(dst, field, field->exclude_prefix ? header->name+strlen(field->name) : header->name, header->value); kazoo_event_add_json_value(dst, field, field->exclude_prefix ? header->name+strlen(field->name) : header->name, header->value);
} }
} }
} }
break; break;
case FIELD_STATIC: case FIELD_STATIC:
@ -308,7 +318,7 @@ cJSON * kazoo_event_add_field_to_json(cJSON *dst, switch_event_t *src, kazoo_fie
break; break;
} }
return item; return item;
} }
static switch_status_t kazoo_event_add_fields_to_json(kazoo_logging_ptr logging, cJSON *dst, switch_event_t *src, kazoo_field_ptr field) { static switch_status_t kazoo_event_add_fields_to_json(kazoo_logging_ptr logging, cJSON *dst, switch_event_t *src, kazoo_field_ptr field) {