[svn-commits] mjordan: trunk r426179 - in /trunk: ./ res/res_phoneprov.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sun Oct 26 21:27:56 2014
New Revision: 426179

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=426179
Log:
res/res_phoneprov: Fix crash on shutdown caused by container cleanup

In res_phoneprov, unloading the module first destroys the http_routes
container, followed by the users. However, users may have a route in
the http_routes container; the validity of this container is not checked
in the users destructor. Hence, we hit an assert as the container has already
been set to NULL.

This patch does two things:
(1) It adds a sanity check in the user destructor (because why not)
(2) It switches the order of destruction, so that users are disposed of prior
    to the HTTP routes they may hold a reference to.

Note that this crash was caught by the Test Suite (go go testing!)
........

Merged revisions 426174 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 426176 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_phoneprov.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_phoneprov.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_phoneprov.c?view=diff&rev=426179&r1=426178&r2=426179
==============================================================================
--- trunk/res/res_phoneprov.c (original)
+++ trunk/res/res_phoneprov.c Sun Oct 26 21:27:56 2014
@@ -758,7 +758,9 @@
 		user->profile = unref_profile(user->profile);
 	}
 
-	ao2_callback(http_routes, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, routes_delete_cb, (void *)user->macaddress);
+	if (http_routes) {
+		ao2_callback(http_routes, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, routes_delete_cb, (void *)user->macaddress);
+	}
 
 	ast_string_field_free_memory(user);
 }
@@ -1382,9 +1384,9 @@
 	ao2_cleanup(profiles);
 	profiles = NULL;
 	delete_routes();
+	delete_users();
 	ao2_cleanup(http_routes);
 	http_routes = NULL;
-	delete_users();
 	ao2_cleanup(users);
 	users = NULL;
 	delete_providers();