kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-05 04:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "AST-2017-010: Fix cdr_object_update_party_b_userfield_cb() buf overrun" into 13

Browse Source
This commit is contained in:
George Joseph
2017-11-08 08:26:10 -06:00
committed by Gerrit Code Review
parent 936a85419e 2b85799512
commit b2fbf1afd7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/cdr.c
View File

@@ -3384,7 +3384,8 @@ static int cdr_object_update_party_b_userfield_cb(void *obj, void *arg, void *da
ast_assert(cdr->party_b.snapshot ast_assert(cdr->party_b.snapshot
&& !strcasecmp(cdr->party_b.snapshot->name, info->channel_name)); && !strcasecmp(cdr->party_b.snapshot->name, info->channel_name));
strcpy(cdr->party_b.userfield, info->userfield); ast_copy_string(cdr->party_b.userfield, info->userfield,
sizeof(cdr->party_b.userfield));
} }
return 0; return 0;
@@ -3407,7 +3408,8 @@ void ast_cdr_setuserfield(const char *channel_name, const char *userfield)
if (it_cdr->fn_table == &finalized_state_fn_table && it_cdr->next != NULL) { if (it_cdr->fn_table == &finalized_state_fn_table && it_cdr->next != NULL) {
continue; continue;
} }
ast_copy_string(it_cdr->party_a.userfield, userfield, AST_MAX_USER_FIELD); ast_copy_string(it_cdr->party_a.userfield, userfield,
sizeof(it_cdr->party_a.userfield));
} }
ao2_unlock(cdr); ao2_unlock(cdr);
} }