Merged revisions 94468 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Fri, 21 Dec 2007 16:52:04 +0000 (16:52 +0000)
committerMark Michelson <mmichelson@digium.com>
Fri, 21 Dec 2007 16:52:04 +0000 (16:52 +0000)
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

main/dial.c

index 2766292..26ffc13 100644 (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++) {