[Asterisk-code-review] pbx: Prevent execution of NULL pointer. (asterisk[master])

[Jenkins2]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7805 )

Change subject: pbx: Prevent execution of NULL pointer.
......................................................................

pbx: Prevent execution of NULL pointer.

pbx_extension_helper has a check for q->swo.exec == NULL but it doesn't
actually return so we would still run the function.  Fix the return.
Move the 'int res' variable into the only scope which uses it.

Also fix a copy-paste error in ast_pbx_init which could result in a
crash on allocation failure (we exit with a normal error instead).

Change-Id: I0693af921fdc7f56b6a72a21fb816ed08b960a69
---
M main/pbx.c
1 file changed, 7 insertions(+), 5 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/main/pbx.c b/main/pbx.c
index 12daa67..b850e8e 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2863,7 +2863,6 @@
 	struct ast_exten *e;
 	struct ast_app *app;
 	char *substitute = NULL;
-	int res;
 	struct pbx_find_info q = { .stacklen = 0 }; /* the rest is reset in pbx_find_extension */
 	char passdata[EXT_DATA_SIZE];
 	int matching_action = (action == E_MATCH || action == E_CANMATCH || action == E_MATCHMORE);
@@ -2880,9 +2879,12 @@
 			ast_unlock_contexts();
 			return -1;	/* success, we found it */
 		} else if (action == E_FINDLABEL) { /* map the label to a priority */
-			res = e->priority;
+			int res = e->priority;
+
 			ast_unlock_contexts();
-			return res;	/* the priority we were looking for */
+
+			/* the priority we were looking for */
+			return res;
 		} else {	/* spawn */
 			if (!e->cached_app)
 				e->cached_app = pbx_findapp(e->app);
@@ -2932,7 +2934,7 @@
 		} else {
 			if (!q.swo->exec) {
 				ast_log(LOG_WARNING, "No execution engine for switch %s\n", q.swo->name);
-				res = -1;
+				return -1;
 			}
 			return q.swo->exec(c, q.foundcontext ? q.foundcontext : context, exten, priority, callerid, q.data);
 		}
@@ -8922,7 +8924,7 @@
 	/* This is protected by the context_and_merge lock */
 	autohints = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_NOLOCK, HASH_EXTENHINT_SIZE,
 		autohint_hash_cb, autohint_cmp);
-	if (hintdevices) {
+	if (autohints) {
 		ao2_container_register("autohints", autohints, print_autohint_key);
 	}
 	statecbs = ao2_container_alloc(1, NULL, statecbs_cmp);

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

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0693af921fdc7f56b6a72a21fb816ed08b960a69
Gerrit-Change-Number: 7805
Gerrit-PatchSet: 2
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
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/20180108/a60e45fa/attachment.html>