From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 11 Dec 2005 01:26:09 +0000 (+0000)
Subject: Bug 5965 - major bug in AST_LIST_REMOVE
X-Git-Tag: 1.4.0-beta1~3201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9a99af589ec10e0859ee2df11a31655457c44a9;p=thirdparty%2Fasterisk.git

Bug 5965 - major bug in AST_LIST_REMOVE


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
index cfe8462254..f687189e28 100644
--- a/include/asterisk/linkedlists.h
+++ b/include/asterisk/linkedlists.h
@@ -424,15 +424,16 @@ struct {								\
 #define AST_LIST_REMOVE(head, elm, field) do {			        \
 	if ((head)->first == (elm)) {					\
 		(head)->first = (elm)->field.next;			\
-	}								\
-	else {								\
+		if ((head)->last = (elm))			\
+			(head)->last = NULL;			\
+	} else {								\
 		typeof(elm) curelm = (head)->first;			\
 		while (curelm->field.next != (elm))			\
 			curelm = curelm->field.next;			\
 		curelm->field.next = (elm)->field.next;			\
+		if ((head)->last == curelm->field.next)			\
+			(head)->last = curelm;				\
 	}								\
-	if ((head)->last == elm)					\
-		(head)->last = NULL;					\
 } while (0)
 
 #endif /* _ASTERISK_LINKEDLISTS_H */