diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-08 05:43:51 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-08 05:43:51 -0600 |
| commit | 776ec5765ddf06bd77c4bb8c188ca9ea2f7e2b69 (patch) | |
| tree | e85770283bfcdf952644aaabb406e96f987ad581 | |
| parent | eeb99efead79585641f44d040b77736471ad04e2 (diff) | |
| parent | 0f141351f9287173cf872f0cd24cada95903f361 (diff) | |
Merge "pbx: Prevent execution of NULL pointer." into 13
| -rw-r--r-- | main/pbx.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/main/pbx.c b/main/pbx.c index 173b62e99..b313e0528 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2823,7 +2823,6 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, 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); @@ -2840,9 +2839,12 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, 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); @@ -2892,7 +2894,7 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, } 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); } |