diff options
| author | Joshua Colp <jcolp@digium.com> | 2013-12-09 18:32:02 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2013-12-09 18:32:02 +0000 |
| commit | dcb642e2da10f2393900ff530c4369f79173193d (patch) | |
| tree | de6056ce0de803e0ccc6cad0cedb1d2d1f78afa6 /main/endpoints.c | |
| parent | cf5e00138d0c6252fbdea72cd3ffd160ceee6358 (diff) | |
endpoints: Keep a reference to channel ids when creating snapshot.
The snapshot process for endpoints uses the channel ids present
on the endpoint itself. Without keeping a reference it was possible
for the strings to be freed underneath any consumer of an endpoint
snapshot.
A reference is now held by the snapshot to the channel ids and
released when the snapshot is destroyed.
(issue ASTERISK-22801)
Reported by: Matt Jordan
........
Merged revisions 403542 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403543 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/endpoints.c')
| -rw-r--r-- | main/endpoints.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/main/endpoints.c b/main/endpoints.c index 9eeadfeef..4be4eb31b 100644 --- a/main/endpoints.c +++ b/main/endpoints.c @@ -388,8 +388,14 @@ void ast_endpoint_set_max_channels(struct ast_endpoint *endpoint, static void endpoint_snapshot_dtor(void *obj) { struct ast_endpoint_snapshot *snapshot = obj; + int channel; ast_assert(snapshot != NULL); + + for (channel = 0; channel < snapshot->num_channels; channel++) { + ao2_ref(snapshot->channel_ids[channel], -1); + } + ast_string_field_free_memory(snapshot); } @@ -422,8 +428,8 @@ struct ast_endpoint_snapshot *ast_endpoint_snapshot_create( i = ao2_iterator_init(endpoint->channel_ids, 0); while ((obj = ao2_iterator_next(&i))) { - RAII_VAR(char *, channel_id, obj, ao2_cleanup); - snapshot->channel_ids[snapshot->num_channels++] = channel_id; + /* The reference is kept so the channel id does not go away until the snapshot is gone */ + snapshot->channel_ids[snapshot->num_channels++] = obj; } ao2_iterator_destroy(&i); |