[asterisk-commits] jrose: branch 1.6.2 r330490 - /branches/1.6.2/main/features.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon Aug  1 16:08:10 2011
New Revision: 330490

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330490
Log:
Asterisk 18103 - Fix reload crash caused by destroying default parking lot

Default parking lot was being destroyed in reload and was not being rebuilt properly.
This patch keeps features.c reload from destroying the default parking lot in 1.6.2.
Bug was caused by a hasty backport which didn't test reload enough times to catch the
problem.

(Closes Issue ASTERISK-18103)
Reported by: 808blogger

Review: https://reviewboard.asterisk.org/r/1337/

Modified:
    branches/1.6.2/main/features.c

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=330490&r1=330489&r2=330490
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Mon Aug  1 16:08:10 2011
@@ -4251,8 +4251,10 @@
 		struct ast_parkinglot *p;
 		struct ao2_iterator iter = ao2_iterator_init(parkinglots, 0);
 		while ((p = ao2_iterator_next(&iter))) {
-			ao2_unlink(parkinglots, p);
-			ao2_ref(p,-1);
+			if (p != default_parkinglot) {
+				ao2_unlink(parkinglots, p);
+				ao2_ref(p,-1);
+			}
 		}
 		ao2_iterator_destroy(&iter);
 	}