From: Corey Farrell <git@cfware.com>
Date: Sat, 21 Feb 2015 02:55:26 +0000 (+0000)
Subject: Allow shutdown to unload modules that register bucket scheme's or codec's.
X-Git-Tag: 11.17.0-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5464d4df0016c88f473cc8547cd1b700efdf65b6;p=thirdparty%2Fasterisk.git

Allow shutdown to unload modules that register bucket scheme's or codec's.

* Change __ast_module_shutdown_ref to be NULL safe (11+).
* Allow modules that call ast_bucket_scheme_register or ast_codec_register
  to be unloaded during graceful shutdown only (13+ only).

ASTERISK-24796 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4428/


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

diff --git a/main/loader.c b/main/loader.c
index c4d438a3d9..b183b4f366 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -1378,10 +1378,12 @@ struct ast_module *__ast_module_ref(struct ast_module *mod, const char *file, in
 
 void __ast_module_shutdown_ref(struct ast_module *mod, const char *file, int line, const char *func)
 {
-	if (!mod->flags.keepuntilshutdown) {
-		__ast_module_ref(mod, file, line, func);
-		mod->flags.keepuntilshutdown = 1;
+	if (!mod || mod->flags.keepuntilshutdown) {
+		return;
 	}
+
+	__ast_module_ref(mod, file, line, func);
+	mod->flags.keepuntilshutdown = 1;
 }
 
 void __ast_module_unref(struct ast_module *mod, const char *file, int line, const char *func)