diff options
author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-22 20:13:05 +0000 |
---|---|---|
committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-22 20:13:05 +0000 |
commit | 48848cc51d1f33ca5034eb8d1cd8a9e1e041f96c (patch) | |
tree | ed2aa1249accf3390478d56d3f3a9618e50ff3aa | |
parent | 31e7dd9226e1ec217c8e03dcb13801c8e995d256 (diff) |
bug in the linkedlists macros where the prev node
was improperly managed when doing removals or insertions.
also solved issues with app_voicemail init. and reload
solves bug #6557
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@10766 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_voicemail.c | 1 | ||||
-rw-r--r-- | include/asterisk/linkedlists.h | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 6e19c95c2..7b9a37dfd 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5898,7 +5898,6 @@ static int load_config(void) } zones = NULL; zonesl = NULL; - AST_LIST_HEAD_INIT(&users); memset(ext_pass_cmd, 0, sizeof(ext_pass_cmd)); if (cfg) { diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index 49dd3a10d..17d92c57a 100644 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -298,9 +298,11 @@ struct { \ #define AST_LIST_TRAVERSE_SAFE_BEGIN(head, var, field) { \ typeof((head)->first) __list_next; \ typeof((head)->first) __list_prev = NULL; \ - for ((var) = (head)->first, __list_next = (var) ? (var)->field.next : NULL; \ + typeof((head)->first) __new_prev = NULL; \ + for ((var) = (head)->first, __new_prev = (var), \ + __list_next = (var) ? (var)->field.next : NULL; \ (var); \ - __list_prev = (var), (var) = __list_next, \ + __list_prev = __new_prev, (var) = __list_next, \ __list_next = (var) ? (var)->field.next : NULL \ ) @@ -316,6 +318,7 @@ struct { \ previous entry, if any). */ #define AST_LIST_REMOVE_CURRENT(head, field) \ + __new_prev = __list_prev; \ if (__list_prev) \ __list_prev->field.next = __list_next; \ else \ @@ -340,7 +343,8 @@ struct { \ } else { \ (elm)->field.next = (head)->first; \ (head)->first = (elm); \ - } \ + } \ + __new_prev = (elm); \ } while (0) /*! |