[asterisk-commits] bebuild: tag 1.8.18.1 r377307 - in /tags/1.8.18.1: ./ channels/

[SVN commits to the Asterisk project]

Author: bebuild
Date: Thu Dec  6 07:35:05 2012
New Revision: 377307

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377307
Log:
Merge r376868 for 1.8.18.1

Removed:
    tags/1.8.18.1/asterisk-1.8.18.0-summary.html
    tags/1.8.18.1/asterisk-1.8.18.0-summary.txt
Modified:
    tags/1.8.18.1/   (props changed)
    tags/1.8.18.1/.version
    tags/1.8.18.1/ChangeLog
    tags/1.8.18.1/channels/chan_local.c

Propchange: tags/1.8.18.1/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/1.8:376868

Modified: tags/1.8.18.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.18.1/.version?view=diff&rev=377307&r1=377306&r2=377307
==============================================================================
--- tags/1.8.18.1/.version (original)
+++ tags/1.8.18.1/.version Thu Dec  6 07:35:05 2012
@@ -1,1 +1,1 @@
-1.8.18.0
+1.8.18.1

Modified: tags/1.8.18.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.18.1/ChangeLog?view=diff&rev=377307&r1=377306&r2=377307
==============================================================================
--- tags/1.8.18.1/ChangeLog (original)
+++ tags/1.8.18.1/ChangeLog Thu Dec  6 07:35:05 2012
@@ -1,3 +1,14 @@
+2012-12-06  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 1.8.18.1 Released.
+
+	* chan_local: Fix local_pvt ref leak in local_devicestate().
+
+	  Regression introduced by ASTERISK-20390 fix.
+
+	  (closes issue ASTERISK-20769)
+	  Reported by: rmudgett
+
 2012-11-06  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 1.8.18.0 Released.

Modified: tags/1.8.18.1/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.18.1/channels/chan_local.c?view=diff&rev=377307&r1=377306&r2=377307
==============================================================================
--- tags/1.8.18.1/channels/chan_local.c (original)
+++ tags/1.8.18.1/channels/chan_local.c Thu Dec  6 07:35:05 2012
@@ -308,15 +308,20 @@
 	res = AST_DEVICE_NOT_INUSE;
 
 	it = ao2_iterator_init(locals, 0);
-	while ((lp = ao2_iterator_next(&it)) && (res == AST_DEVICE_NOT_INUSE)) {
-		if (!strcmp(exten, lp->exten) && !strcmp(context, lp->context) && lp->owner) {
-			ao2_lock(lp);
-			if (ast_test_flag(lp, LOCAL_LAUNCHED_PBX)) {
-				res = AST_DEVICE_INUSE;
-			}
-			ao2_unlock(lp);
-		}
-		ao2_ref(lp, -1);
+	for (; (lp = ao2_iterator_next(&it)); ao2_ref(lp, -1)) {
+		int is_inuse;
+
+		ao2_lock(lp);
+		is_inuse = !strcmp(exten, lp->exten)
+			&& !strcmp(context, lp->context)
+			&& lp->owner
+			&& ast_test_flag(lp, LOCAL_LAUNCHED_PBX);
+		ao2_unlock(lp);
+		if (is_inuse) {
+			res = AST_DEVICE_INUSE;
+			ao2_ref(lp, -1);
+			break;
+		}
 	}
 	ao2_iterator_destroy(&it);