From 0f49e6ee2e270ef2e6df18c990fcf24f679eba44 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Thu, 27 Jul 2017 21:58:22 -0400 Subject: 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 --- utils/astman.c | 2 +- utils/extconf.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/astman.c b/utils/astman.c index 315b3b065..9e0373c7d 100644 --- a/utils/astman.c +++ b/utils/astman.c @@ -289,7 +289,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 7989bcd2c..837971ba2 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -4590,6 +4590,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; -- cgit v1.2.3