From 18101ff0e35a526c5380b5ecebc6bdcc078bf0e3 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 6 Jun 2007 16:58:28 +0000 Subject: Merged revisions 67716 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r67716 | russell | 2007-06-06 11:55:59 -0500 (Wed, 06 Jun 2007) | 13 lines Merged revisions 67715 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r67715 | russell | 2007-06-06 11:40:51 -0500 (Wed, 06 Jun 2007) | 5 lines We have some bug reports showing crashes due to a double free of a channel. Add a sanity check to ast_channel_free() to make sure we don't go on trying to free a channel that wasn't found in the channel list. (issue #8850, and others...) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67717 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/linkedlists.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index 2c9a570c1..1bf933a14 100644 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -729,8 +729,10 @@ struct { \ used to link entries of this list together. \warning The removed entry is \b not freed nor modified in any way. */ -#define AST_LIST_REMOVE(head, elm, field) do { \ +#define AST_LIST_REMOVE(head, elm, field) ({ \ + __typeof(elm) __res = NULL; \ if ((head)->first == (elm)) { \ + __res = (head)->first; \ (head)->first = (elm)->field.next; \ if ((head)->last == (elm)) \ (head)->last = NULL; \ @@ -739,13 +741,15 @@ struct { \ while (curelm && (curelm->field.next != (elm))) \ curelm = curelm->field.next; \ if (curelm) { \ + __res = curelm; \ curelm->field.next = (elm)->field.next; \ if ((head)->last == (elm)) \ (head)->last = curelm; \ } \ } \ - (elm)->field.next = NULL; \ -} while (0) + (elm)->field.next = NULL; \ + (__res); \ +}) #define AST_RWLIST_REMOVE AST_LIST_REMOVE -- cgit v1.2.3