kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 12:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 94468 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r94468 | mmichelson | 2007-12-21 10:49:35 -0600 (Fri, 21 Dec 2007) | 6 lines

Since we are freeing list elements within a list traversal, we need to use the safe
traversal and remove the item from the list before freeing it.

(closes issue 11612, reported by dtyoo)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-12-21 16:52:04 +00:00
parent bec8762a52
commit 804d90368a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/dial.c
View File

@@ -797,7 +797,7 @@ int ast_dial_destroy(struct ast_dial *dial)
return -1;
/* Hangup and deallocate all the dialed channels */
AST_LIST_TRAVERSE(&dial->channels, channel, list) {
AST_LIST_TRAVERSE_SAFE_BEGIN(&dial->channels, channel, list) {
/* Disable any enabled options */
for (i = 0; i < AST_DIAL_OPTION_MAX; i++) {
if (!channel->options[i])
@@ -814,8 +814,10 @@ int ast_dial_destroy(struct ast_dial *dial)
/* Free structure */
ast_free(channel->tech);
ast_free(channel->device);
AST_LIST_REMOVE_CURRENT(&dial->channels, list);
ast_free(channel);
}
AST_LIST_TRAVERSE_SAFE_END;
/* Disable any enabled options globally */
for (i = 0; i < AST_DIAL_OPTION_MAX; i++) {