Skip to content
Snippets Groups Projects
Commit ada8ae56 authored by Joshua Colp's avatar Joshua Colp
Browse files

Fix a double free issue with the Pickup dialplan application.

As part of the pickup process the connected line information is updated.
Part of this process does a shallow copy of the target channel's connected line
information to a local structure. Once complete the structure contents are freed.
As a result any information in the target channel's connected line information
structure is no longer valid. This change will now set the contents back to a clean
state so that the freeing of the target channel's connected line information structure
when the channel is destroyed will no longer try to double free things.

(closes issue #14839)
Reported by: lmsteffan


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@190217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 1ce1f1bb
No related branches found
No related tags found
No related merge requests found
......@@ -105,6 +105,7 @@ static int pickup_do(struct ast_channel *chan, struct ast_channel *target)
ast_channel_unlock(chan);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
ast_channel_queue_connected_line_update(chan, &connected_caller);
ast_party_connected_line_init(&target->connected);
ast_party_connected_line_free(&connected_caller);
if ((res = ast_answer(chan))) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment