diff options
author | Automerge script <automerge@asterisk.org> | 2012-12-17 23:18:40 +0000 |
---|---|---|
committer | Automerge script <automerge@asterisk.org> | 2012-12-17 23:18:40 +0000 |
commit | 84e6a9847a7b564e4561d500c896a6985bb1e13e (patch) | |
tree | 2daf02d898eef00fa9dce9812f412a9b3dd4c0db /main | |
parent | f1e6eefdbab426cef2eec91e8b86bb4a42f52d39 (diff) |
Merged revisions 378091,378095 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r378091 | rmudgett | 2012-12-17 17:02:54 -0600 (Mon, 17 Dec 2012) | 22 lines
Make chan_local module references tied to local_pvt lifetime.
The chan_local module references were manually tied to the existence of
the ;1 and ;2 channel links.
* Made chan_local module references tied to the existence of the local_pvt
structure as well as automatically take care of the module references.
* Tweaked the wording of the local_fixup() failure warning message to make
sense.
Review: https://reviewboard.asterisk.org/r/2181/
........
Merged revisions 378088 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378089 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378090 from http://svn.asterisk.org/svn/asterisk/branches/11
................
r378095 | rmudgett | 2012-12-17 17:10:42 -0600 (Mon, 17 Dec 2012) | 11 lines
Fix potential double free when unloading a module.
........
Merged revisions 378092 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378093 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378094 from http://svn.asterisk.org/svn/asterisk/branches/11
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/loader.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/main/loader.c b/main/loader.c index 2af9d2006..7ad515f8a 100644 --- a/main/loader.c +++ b/main/loader.c @@ -237,9 +237,18 @@ void __ast_module_user_remove(struct ast_module *mod, struct ast_module_user *u) if (!u) { return; } + AST_LIST_LOCK(&mod->users); - AST_LIST_REMOVE(&mod->users, u, entry); + u = AST_LIST_REMOVE(&mod->users, u, entry); AST_LIST_UNLOCK(&mod->users); + if (!u) { + /* + * Was not in the list. Either a bad pointer or + * __ast_module_user_hangup_all() has been called. + */ + return; + } + ast_atomic_fetchadd_int(&mod->usecount, -1); ast_free(u); @@ -559,15 +568,26 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f } if (!error) { + /* Request any channels attached to the module to hangup. */ __ast_module_user_hangup_all(mod); - res = mod->info->unload(); + res = mod->info->unload(); if (res) { ast_log(LOG_WARNING, "Firm unload failed for %s\n", resource_name); - if (force <= AST_FORCE_FIRM) + if (force <= AST_FORCE_FIRM) { error = 1; - else + } else { ast_log(LOG_WARNING, "** Dangerous **: Unloading resource anyway, at user request\n"); + } + } + + if (!error) { + /* + * Request hangup on any channels that managed to get attached + * while we called the module unload function. + */ + __ast_module_user_hangup_all(mod); + sched_yield(); } } |