diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-05 17:52:08 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-05 17:52:08 +0000 |
| commit | cc093e3faffac6d1a1892b6b4150b1d5c55b5c9f (patch) | |
| tree | aed412a5f5bda7113a61c5f0a17829264787a285 | |
| parent | 7f0f1e85e8ab8fef3ef556b111929d1e51dde0d2 (diff) | |
Merged revisions 88624 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88624 | russell | 2007-11-05 11:46:02 -0600 (Mon, 05 Nov 2007) | 5 lines
Fix up datastore handling in ast_do_masquerade(). The code is intended to move
any channel datastores from the old channel to the new one. However, it did
not use the linked list macros properly to accomplish the task. The existing
code would only work if there was only a single datastore on the old channel.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88651 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 84d5cd66a..d5fcb0a2d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3688,8 +3688,7 @@ int ast_do_masquerade(struct ast_channel *original) /* Move data stores over */ if (AST_LIST_FIRST(&clone->datastores)) - AST_LIST_INSERT_TAIL(&original->datastores, AST_LIST_FIRST(&clone->datastores), entry); - AST_LIST_HEAD_INIT_NOLOCK(&clone->datastores); + AST_LIST_APPEND_LIST(&original->datastores, &clone->datastores, entry); clone_variables(original, clone); /* Presense of ADSI capable CPE follows clone */ |