From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 10 Sep 2007 19:53:17 +0000 (+0000)
Subject: backport astobj2 race condition fix.  This function is the exact same as trunk
X-Git-Tag: 1.4.12~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8261abd0b901079b4b4b4ef84f3b3c9bdeaf722;p=thirdparty%2Fasterisk.git

backport astobj2 race condition fix.  This function is the exact same as trunk
so it applies here as well.


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

diff --git a/main/astobj2.c b/main/astobj2.c
index 5fef8b1fa3..0f23dfc083 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -513,6 +513,7 @@ void * ao2_iterator_next(struct ao2_iterator *a)
 {
 	int lim;
 	struct bucket_list *p = NULL;
+	void *ret = NULL;
 
 	if (INTERNAL_OBJ(a->c) == NULL)
 		return NULL;
@@ -553,14 +554,15 @@ found:
 		a->version = p->version;
 		a->obj = p;
 		a->c_version = a->c->version;
+		ret = EXTERNAL_OBJ(p->astobj);
 		/* inc refcount of returned object */
-		ao2_ref(EXTERNAL_OBJ(p->astobj), 1);
+		ao2_ref(ret, 1);
 	}
 
 	if (!(a->flags & F_AO2I_DONTLOCK))
 		ao2_unlock(a->c);
 
-	return p ? EXTERNAL_OBJ(p->astobj) : NULL;
+	return ret;
 }
 
 /* callback for destroying container.