kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Since we are freeing list elements within a list traversal, we need to use the safe

Browse Source 
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/branches/1.4@94468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-12-21 16:49:35 +00:00
parent 5977f8d5be
commit 8c7948fd44
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

@@ -681,7 +681,7 @@ int ast_dial_destroy(struct ast_dial *dial)
return -1; return -1;
/* Hangup and deallocate all the dialed channels */ /* 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 */ /* Disable any enabled options */
for (i = 0; i < AST_DIAL_OPTION_MAX; i++) { for (i = 0; i < AST_DIAL_OPTION_MAX; i++) {
if (!channel->options[i]) if (!channel->options[i])
@@ -696,8 +696,10 @@ int ast_dial_destroy(struct ast_dial *dial)
channel->owner = NULL; channel->owner = NULL;
} }
/* Free structure */ /* Free structure */
AST_LIST_REMOVE_CURRENT(&dial->channels, list);
free(channel); free(channel);
} }
AST_LIST_TRAVERSE_SAFE_END;
/* Disable any enabled options globally */ /* Disable any enabled options globally */
for (i = 0; i < AST_DIAL_OPTION_MAX; i++) { for (i = 0; i < AST_DIAL_OPTION_MAX; i++) {