From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 5 Nov 2012 21:41:04 +0000 (+0000)
Subject: Add safety NULL pointer check in module user references.
X-Git-Tag: 11.1.0-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=463cbc55ac17f1013a8510473a471ad7daf45752;p=thirdparty%2Fasterisk.git

Add safety NULL pointer check in module user references.

Made __ast_module_user_remove() check for NULL pointers.
........

Merged revision 375860 from C.3
........

Merged revisions 375862 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 375863 from http://svn.asterisk.org/svn/asterisk/branches/10


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

diff --git a/main/loader.c b/main/loader.c
index c1dfc839e6..2af9d2006d 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -210,13 +210,14 @@ void ast_module_unregister(const struct ast_module_info *info)
 	}
 }
 
-struct ast_module_user *__ast_module_user_add(struct ast_module *mod,
-					      struct ast_channel *chan)
+struct ast_module_user *__ast_module_user_add(struct ast_module *mod, struct ast_channel *chan)
 {
-	struct ast_module_user *u = ast_calloc(1, sizeof(*u));
+	struct ast_module_user *u;
 
-	if (!u)
+	u = ast_calloc(1, sizeof(*u));
+	if (!u) {
 		return NULL;
+	}
 
 	u->chan = chan;
 
@@ -233,6 +234,9 @@ struct ast_module_user *__ast_module_user_add(struct ast_module *mod,
 
 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);
 	AST_LIST_UNLOCK(&mod->users);