summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2017-07-27 21:58:22 -0400
committerGeorge Joseph <gjoseph@digium.com>2017-08-01 15:42:38 -0600
commit58d032112b28294946427a379c40d51e5238999a (patch)
treed523247ac7e72502120025c6f7b56a99edd38d34 /utils
parent3f98488279dbc576c7569e8dd23e3120c07bbe7e (diff)
Fix compiler warnings on Fedora 26 / GCC 7.
GCC 7 has added capability to produce warnings, this fixes most of those warnings. The specific warnings are disabled in a few places: * app_voicemail.c: truncation of paths more than 4096 chars in many places. * chan_mgcp.c: callid truncated to 80 chars. * cdr.c: two userfields are combined to cdr copy, fix would break ABI. * tcptls.c: ignore use of deprecated method SSLv3_client_method(). ASTERISK-27156 #close Change-Id: I65f280e7d3cfad279d16f41823a4d6fddcbc4c88
Diffstat (limited to 'utils')
-rw-r--r--utils/astman.c2
-rw-r--r--utils/extconf.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/utils/astman.c b/utils/astman.c
index 63d7f5ada..af3185104 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -275,7 +275,7 @@ static void rebuild_channels(newtComponent c)
{
void *prev = NULL;
struct ast_chan *chan;
- char tmpn[42];
+ char tmpn[sizeof(chan->name) + sizeof(chan->callerid) + 3 - 1];
char tmp[256];
int x=0;
prev = newtListboxGetCurrent(c);
diff --git a/utils/extconf.c b/utils/extconf.c
index d035e12c0..116302280 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -4605,6 +4605,10 @@ static struct ast_exten *pbx_find_extension(struct ast_channel *chan,
struct ast_exten *e, *eroot;
struct ast_include *i;
+ if (!context) {
+ return NULL;
+ }
+
/* Initialize status if appropriate */
if (q->stacklen == 0) {
q->status = STATUS_NO_CONTEXT;