[Asterisk-code-review] cdr: Missing NULL check and unlock. (asterisk[15])

[George Joseph]

George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/7739 )

Change subject: cdr: Missing NULL check and unlock.
......................................................................

cdr: Missing NULL check and unlock.

* handle_dial_message: Missing a check for NULL peer.
* cdr_generic_register: Missing unlock on allocation failure.

cdr_generic_register is fixed by reordering so the new structure is
allocated and initialized before locking the list.

Change-Id: I5799b99270d1a7a716a555c31ac85f4b00ce8686
---
M main/cdr.c
1 file changed, 25 insertions(+), 13 deletions(-)

Approvals:
  George Joseph: Looks good to me, but someone else must approve; Approved for Submit
  Richard Mudgett: Looks good to me, approved



diff --git a/main/cdr.c b/main/cdr.c
index 0f6a665..0ec6ada 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -2097,7 +2097,12 @@
 	if (!peer && !caller) {
 		return;
 	}
-	if (filter_channel_snapshot(peer) || (caller && filter_channel_snapshot(caller))) {
+
+	if (peer && filter_channel_snapshot(peer)) {
+		return;
+	}
+
+	if (caller && filter_channel_snapshot(caller)) {
 		return;
 	}
 
@@ -2871,32 +2876,39 @@
 
 static int cdr_generic_register(struct be_list *generic_list, const char *name, const char *desc, ast_cdrbe be)
 {
-	struct cdr_beitem *i = NULL;
+	struct cdr_beitem *i;
+	struct cdr_beitem *cur;
 
-	if (!name)
+	if (!name) {
 		return -1;
+	}
 
 	if (!be) {
 		ast_log(LOG_WARNING, "CDR engine '%s' lacks backend\n", name);
+
 		return -1;
 	}
 
-	AST_RWLIST_WRLOCK(generic_list);
-	AST_RWLIST_TRAVERSE(generic_list, i, list) {
-		if (!strcasecmp(name, i->name)) {
-			ast_log(LOG_WARNING, "Already have a CDR backend called '%s'\n", name);
-			AST_RWLIST_UNLOCK(generic_list);
-			return -1;
-		}
-	}
-
-	if (!(i = ast_calloc(1, sizeof(*i))))
+	i = ast_calloc(1, sizeof(*i));
+	if (!i) {
 		return -1;
+	}
 
 	i->be = be;
 	ast_copy_string(i->name, name, sizeof(i->name));
 	ast_copy_string(i->desc, desc, sizeof(i->desc));
 
+	AST_RWLIST_WRLOCK(generic_list);
+	AST_RWLIST_TRAVERSE(generic_list, cur, list) {
+		if (!strcasecmp(name, cur->name)) {
+			ast_log(LOG_WARNING, "Already have a CDR backend called '%s'\n", name);
+			AST_RWLIST_UNLOCK(generic_list);
+			ast_free(i);
+
+			return -1;
+		}
+	}
+
 	AST_RWLIST_INSERT_HEAD(generic_list, i, list);
 	AST_RWLIST_UNLOCK(generic_list);
 

-- 
To view, visit https://gerrit.asterisk.org/7739
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I5799b99270d1a7a716a555c31ac85f4b00ce8686
Gerrit-Change-Number: 7739
Gerrit-PatchSet: 2
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171228/5dc59a5e/attachment.html>