sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compiler fixes for gcc 10 

This patch fixes a few compile warnings/errors that now occur when using gcc
10+.

Also, the Makefile.rules check to turn off partial inlining in gcc versions
greater or equal to 8.2.1 had a bug where it only it only checked against
versions with at least 3 numbers (ex: 8.2.1 vs 10). This patch now ensures
any version above the specified version is correctly compared.

Change-Id: I54718496eb0c3ce5bd6d427cd279a29e8d2825f9
This commit is contained in:
Kevin Harwell 2020-06-01 18:25:48 -05:00 committed by Friendly Automation
parent 559fa0e89c
commit 3d1bf3c537
23 changed files with 122 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.rules
View File

@ -63,6 +63,7 @@ else
endif
OPTIMIZE?=-O3
ifneq ($(findstring darwin,$(OSARCH)),)
ifeq ($(shell if test `/usr/bin/sw_vers -productVersion | cut -c4` -gt 5; then echo 6; else echo 0; fi),6)
# Snow Leopard/Lion has an issue with this optimization flag on large files (like chan_sip)
@ -70,15 +71,15 @@ ifneq ($(findstring darwin,$(OSARCH)),)
endif
endif
# gcc version 8.2.1 and above must have partial-inlining disabled to avoid documented bug.
# We must handle cross-compiling and clang so make sure the compiler version string has "gcc"
# somewhere in it before testing the version.
CC_VERS_STRING=$(shell $(CC) --version | grep -i gcc)
ifneq ($(CC_VERS_STRING),)
GCC_VER_GTE821:=$(shell expr `echo '$(CC_VERS_STRING)' | cut -d ' ' -f 3 | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 80201)
ifeq ($(GCC_VER_GTE821),1)
OPTIMIZE+=-fno-partial-inlining
endif
ifeq ($(CC),gcc)
# gcc version 8.2.1 and above must have partial-inlining disabled in order
# to avoid a documented bug. Sort to make the lowest version number come
# first. If it's the specified version then the current gcc version is equal
# to or greater, so add the custom optimization rule.
gcc_versions=$(shell printf "%s\n" $$(gcc -dumpversion) 8.2.1 | sort -n)
ifeq ($(firstword $(gcc_versions)),8.2.1)
OPTIMIZE+=-fno-partial-inlining
endif
endif
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))$(AST_CODE_COVERAGE),no)

10
addons/ooh323c/src/decode.c
View File

@ -737,6 +737,10 @@ static int decodeOctets
nbits -= 8;
}
if (nbits <= 0) {
return ASN_OK;
}
/* Copy last partial byte */
if (nbits >= rshift) {
@ -752,7 +756,7 @@ static int decodeOctets
pctxt->buffer.bitOffset = 8 - nbitsInLastOctet;
}
else if (nbits > 0) { /* nbits < rshift */
else { /* nbits > 0 && nbits < rshift */
pbuffer[i] =
pctxt->buffer.data[pctxt->buffer.byteIndex] << lshift;
pctxt->buffer.bitOffset = rshift - nbits;
@ -832,8 +836,8 @@ int decodeOpenType
int decodeSemiConsInteger (OOCTXT* pctxt, ASN1INT* pvalue, ASN1INT lower)
{
signed char b;
unsigned char ub;
signed char b = 0;
unsigned char ub = 0;
ASN1UINT nbytes;
int stat;

2
addons/ooh323c/src/ooSocket.c
View File

@ -389,7 +389,7 @@ int ooSocketAccept (OOSOCKET socket, OOSOCKET *pNewSocket,
if (destAddr != 0) {
if ((host = ast_sockaddr_stringify_addr(&addr)) != NULL)
strncpy(destAddr, host, strlen(host));
memcpy(destAddr, host, strlen(host) + 1);
}
if (destPort != 0)
*destPort = ast_sockaddr_port(&addr);

2
addons/ooh323c/src/oochannels.c
View File

@ -454,7 +454,7 @@ int ooAcceptH225Connection()
call->callToken);
if (remoteIP[0]) {
strncpy(call->remoteIP, remoteIP, strlen(remoteIP));
memcpy(call->remoteIP, remoteIP, strlen(remoteIP) + 1);
}
ast_mutex_unlock(&call->Lock);

11
apps/app_stack.c
View File

@ -313,13 +313,14 @@ static void gosub_release_frame(struct ast_channel *chan, struct gosub_stack_fra
static struct gosub_stack_frame *gosub_allocate_frame(const char *context, const char *extension, int priority, int in_subroutine, unsigned char arguments)
{
struct gosub_stack_frame *new = NULL;
int len_extension = strlen(extension), len_context = strlen(context);
int len_extension = strlen(extension) + 1;
int len_context = strlen(context) + 1;
if ((new = ast_calloc(1, sizeof(*new) + 2 + len_extension + len_context))) {
if ((new = ast_calloc(1, sizeof(*new) + len_extension + len_context))) {
AST_LIST_HEAD_INIT_NOLOCK(&new->varshead);
strcpy(new->extension, extension);
new->context = new->extension + len_extension + 1;
strcpy(new->context, context);
ast_copy_string(new->extension, extension, len_extension);
new->context = new->extension + len_extension;
ast_copy_string(new->context, context, len_context);
new->priority = priority;
new->in_subroutine = in_subroutine ? 1 : 0;
new->arguments = arguments;

22
apps/app_voicemail.c
View File

@ -1115,10 +1115,12 @@ static int inprocess_cmp_fn(void *obj, void *arg, int flags)
static int inprocess_count(const char *context, const char *mailbox, int delta)
{
struct inprocess *i, *arg = ast_alloca(sizeof(*arg) + strlen(context) + strlen(mailbox) + 2);
arg->context = arg->mailbox + strlen(mailbox) + 1;
strcpy(arg->mailbox, mailbox); /* SAFE */
strcpy(arg->context, context); /* SAFE */
int context_len = strlen(context) + 1;
int mailbox_len = strlen(mailbox) + 1;
struct inprocess *i, *arg = ast_alloca(sizeof(*arg) + context_len + mailbox_len);
arg->context = arg->mailbox + mailbox_len;
ast_copy_string(arg->mailbox, mailbox, mailbox_len); /* SAFE */
ast_copy_string(arg->context, context, context_len); /* SAFE */
ao2_lock(inprocess_container);
if ((i = ao2_find(inprocess_container, arg, 0))) {
int ret = ast_atomic_fetchadd_int(&i->count, delta);
@ -1129,13 +1131,13 @@ static int inprocess_count(const char *context, const char *mailbox, int delta)
if (delta < 0) {
ast_log(LOG_WARNING, "BUG: ref count decrement on non-existing object???\n");
}
if (!(i = ao2_alloc(sizeof(*i) + strlen(context) + strlen(mailbox) + 2, NULL))) {
if (!(i = ao2_alloc(sizeof(*i) + context_len + mailbox_len, NULL))) {
ao2_unlock(inprocess_container);
return 0;
}
i->context = i->mailbox + strlen(mailbox) + 1;
strcpy(i->mailbox, mailbox); /* SAFE */
strcpy(i->context, context); /* SAFE */
i->context = i->mailbox + mailbox_len;
ast_copy_string(i->mailbox, mailbox, mailbox_len); /* SAFE */
ast_copy_string(i->context, context, context_len); /* SAFE */
i->count = delta;
ao2_link(inprocess_container, i);
ao2_unlock(inprocess_container);
@ -13564,8 +13566,8 @@ static struct alias_mailbox_mapping *alias_mailbox_mapping_create(const char *al
}
mapping->alias = mapping->buf;
mapping->mailbox = mapping->buf + from_len;
strcpy(mapping->alias, alias); /* Safe */
strcpy(mapping->mailbox, mailbox); /* Safe */
ast_copy_string(mapping->alias, alias, from_len); /* Safe */
ast_copy_string(mapping->mailbox, mailbox, to_len); /* Safe */
return mapping;
}

7
include/asterisk/app.h
View File

@ -1231,11 +1231,14 @@ int ast_app_group_list_unlock(void);
\note This defines a structure type, but does not declare an instance
of the structure. That must be done separately.
*/
#define AST_DEFINE_APP_ARGS_TYPE(type, arglist) \
struct type { \
unsigned int argc; \
char *argv[0]; \
arglist \
union { \
char *argv[sizeof(struct {arglist}) / sizeof(char *)]; \
struct {arglist}; \
}; \
}
/*!

6
main/dns_srv.c
View File

@ -49,6 +49,7 @@ struct ast_dns_record *dns_srv_alloc(struct ast_dns_query *query, const char *da
struct ast_dns_srv_record *srv;
int host_size;
char host[NI_MAXHOST] = "";
size_t host_len;
ptr = dns_find_record(data, size, query->result->answer, query->result->answer_size);
ast_assert(ptr != NULL);
@ -89,7 +90,8 @@ struct ast_dns_record *dns_srv_alloc(struct ast_dns_query *query, const char *da
return NULL;
}
srv = ast_calloc(1, sizeof(*srv) + size + strlen(host) + 1);
host_len = strlen(host) + 1;
srv = ast_calloc(1, sizeof(*srv) + size + host_len);
if (!srv) {
return NULL;
}
@ -99,7 +101,7 @@ struct ast_dns_record *dns_srv_alloc(struct ast_dns_query *query, const char *da
srv->port = port;
srv->host = srv->data + size;
strcpy((char *)srv->host, host); /* SAFE */
ast_copy_string((char *)srv->host, host, host_len); /* SAFE */
srv->generic.data_ptr = srv->data;
return (struct ast_dns_record *)srv;

6
main/http.c
View File

@ -2025,6 +2025,7 @@ static void add_redirect(const char *value)
struct http_uri_redirect *redirect, *cur;
unsigned int target_len;
unsigned int total_len;
size_t dest_len;
dest = ast_strdupa(value);
dest = ast_skip_blanks(dest);
@ -2038,14 +2039,15 @@ static void add_redirect(const char *value)
}
target_len = strlen(target) + 1;
total_len = sizeof(*redirect) + target_len + strlen(dest) + 1;
dest_len = strlen(dest) + 1;
total_len = sizeof(*redirect) + target_len + dest_len;
if (!(redirect = ast_calloc(1, total_len))) {
return;
}
redirect->dest = redirect->target + target_len;
strcpy(redirect->target, target);
strcpy(redirect->dest, dest);
ast_copy_string(redirect->dest, dest, dest_len);
AST_RWLIST_WRLOCK(&uri_redirects);

2
main/logger.c
View File

@ -2294,7 +2294,7 @@ void __ast_trace(const char *file, int line, const char *func, enum ast_trace_in
va_list ap;
unsigned long indent = (unsigned long)ast_threadstorage_get_ptr(&trace_indent);
struct ast_str *fmt = ast_str_create(128);
char *direction;
const char *direction = "";
if (!fmt) {
return;

2
main/message.c
View File

@ -1421,7 +1421,7 @@ struct ast_msg_data *ast_msg_data_alloc(enum ast_msg_data_source_type source,
/* Set the ones we have and increment the offset */
for (i=0; i < count; i++) {
len = (strlen(attributes[i].value) + 1);
strcpy(msg->buf + current_offset, attributes[i].value); /* Safe */
ast_copy_string(msg->buf + current_offset, attributes[i].value, len); /* Safe */
msg->attribute_value_offsets[attributes[i].type] = current_offset;
current_offset += len;
}

7
main/pbx.c
View File

@ -6519,6 +6519,8 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_
i = ao2_iterator_init(hints, AO2_ITERATOR_DONTLOCK);
for (; (hint = ao2_iterator_next(&i)); ao2_ref(hint, -1)) {
if (ao2_container_count(hint->callbacks)) {
size_t exten_len;
ao2_lock(hint);
if (!hint->exten) {
/* The extension has already been destroyed. (Should never happen here) */
@ -6526,7 +6528,8 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_
continue;
}
length = strlen(hint->exten->exten) + strlen(hint->exten->parent->name) + 2
exten_len = strlen(hint->exten->exten) + 1;
length = exten_len + strlen(hint->exten->parent->name) + 1
+ sizeof(*saved_hint);
if (!(saved_hint = ast_calloc(1, length))) {
ao2_unlock(hint);
@ -6546,7 +6549,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_
saved_hint->context = saved_hint->data;
strcpy(saved_hint->data, hint->exten->parent->name);
saved_hint->exten = saved_hint->data + strlen(saved_hint->context) + 1;
strcpy(saved_hint->exten, hint->exten->exten);
ast_copy_string(saved_hint->exten, hint->exten->exten, exten_len);
if (hint->last_presence_subtype) {
saved_hint->last_presence_subtype = ast_strdup(hint->last_presence_subtype);
}

8
main/pbx_variables.c
View File

@ -211,14 +211,10 @@ static const char *ast_str_substring(struct ast_str *value, int offset, int leng
}
if (length >= 0 && length < lr) { /* truncate if necessary */
char *tmp = ast_str_buffer(value);
tmp[length] = '\0';
ast_str_update(value);
ast_str_truncate(value, length);
} else if (length < 0) {
if (lr > -length) { /* After we remove from the front and from the rear, is there anything left? */
char *tmp = ast_str_buffer(value);
tmp[lr + length] = '\0';
ast_str_update(value);
ast_str_truncate(value, lr + length);
} else {
ast_str_reset(value);
}

12
main/stasis.c
View File

@ -498,6 +498,7 @@ static int link_topic_proxy(struct stasis_topic *topic, const char *name, const
{
struct topic_proxy *proxy;
struct stasis_topic* topic_tmp;
size_t detail_len;
if (!topic || !name || !strlen(name) || !detail) {
return -1;
@ -514,8 +515,10 @@ static int link_topic_proxy(struct stasis_topic *topic, const char *name, const
return -1;
}
detail_len = strlen(detail) + 1;
proxy = ao2_t_weakproxy_alloc(
sizeof(*proxy) + strlen(name) + 1 + strlen(detail) + 1, NULL, name);
sizeof(*proxy) + strlen(name) + 1 + detail_len, NULL, name);
if (!proxy) {
ao2_unlock(topic_all);
@ -527,7 +530,7 @@ static int link_topic_proxy(struct stasis_topic *topic, const char *name, const
proxy->detail = proxy->name + strlen(name) + 1;
strcpy(proxy->name, name); /* SAFE */
strcpy(proxy->detail, detail); /* SAFE */
ast_copy_string(proxy->detail, detail, detail_len); /* SAFE */
proxy->creationtime = ast_tvnow();
/* We have exclusive access to proxy, no need for locking here. */
@ -1620,9 +1623,10 @@ static void subscription_change_dtor(void *obj)
static struct stasis_subscription_change *subscription_change_alloc(struct stasis_topic *topic, const char *uniqueid, const char *description)
{
size_t description_len = strlen(description) + 1;
size_t uniqueid_len = strlen(uniqueid) + 1;
struct stasis_subscription_change *change;
change = ao2_alloc_options(sizeof(*change) + description_len + strlen(uniqueid) + 1,
change = ao2_alloc_options(sizeof(*change) + description_len + uniqueid_len,
subscription_change_dtor, AO2_ALLOC_OPT_LOCK_NOLOCK);
if (!change) {
return NULL;
@ -1630,7 +1634,7 @@ static struct stasis_subscription_change *subscription_change_alloc(struct stasi
strcpy(change->description, description); /* SAFE */
change->uniqueid = change->description + description_len;
strcpy(change->uniqueid, uniqueid); /* SAFE */
ast_copy_string(change->uniqueid, uniqueid, uniqueid_len); /* SAFE */
ao2_ref(topic, +1);
change->topic = topic;

4
main/stasis_channels.c
View File

@ -306,7 +306,7 @@ static struct ast_channel_snapshot_peer *channel_snapshot_peer_create(struct ast
strcpy(snapshot->account, peeraccount); /* Safe */
snapshot->linkedid = snapshot->account + peeraccount_len;
strcpy(snapshot->linkedid, linkedid); /* Safe */
ast_copy_string(snapshot->linkedid, linkedid, linkedid_len); /* Safe */
return snapshot;
}
@ -370,7 +370,7 @@ static struct ast_channel_snapshot_connected *channel_snapshot_connected_create(
strcpy(snapshot->name, name); /* Safe */
snapshot->number = snapshot->name + name_len;
strcpy(snapshot->number, number); /* Safe */
ast_copy_string(snapshot->number, number, number_len); /* Safe */
return snapshot;
}

15
pbx/pbx_dundi.c
View File

@ -722,7 +722,7 @@ static void *dundi_precache_thread(void *data)
{
struct dundi_query_state *st = data;
struct dundi_ie_data ied;
struct dundi_hint_metadata hmd;
struct dundi_hint_metadata hmd = {0};
char eid_str[20];
ast_debug(1, "Whee, precaching '%s@%s' for '%s'\n", st->called_number, st->called_context,
@ -3936,7 +3936,6 @@ int dundi_lookup(struct dundi_result *result, int maxret, struct ast_channel *ch
static void reschedule_precache(const char *number, const char *context, int expiration)
{
int len;
struct dundi_precache_queue *qe, *prev;
AST_LIST_LOCK(&pcq);
@ -3948,16 +3947,16 @@ static void reschedule_precache(const char *number, const char *context, int exp
}
AST_LIST_TRAVERSE_SAFE_END;
if (!qe) {
len = sizeof(*qe);
len += strlen(number) + 1;
len += strlen(context) + 1;
if (!(qe = ast_calloc(1, len))) {
int len = sizeof(*qe);
int num_len = strlen(number) + 1;
int context_len = strlen(context) + 1;
if (!(qe = ast_calloc(1, len + num_len + context_len))) {
AST_LIST_UNLOCK(&pcq);
return;
}
strcpy(qe->number, number);
qe->context = qe->number + strlen(number) + 1;
strcpy(qe->context, context);
qe->context = qe->number + num_len + 1;
ast_copy_string(qe->context, context, context_len);
}
time(&qe->expiration);
qe->expiration += expiration;

11
res/parking/parking_bridge_features.c
View File

@ -179,7 +179,8 @@ static int create_parked_subscription_full(struct ast_channel *chan, const char
struct parked_subscription_data *subscription_data;
char *parker_uuid = ast_strdupa(ast_channel_uniqueid(chan));
size_t parker_uuid_size = strlen(parker_uuid) + 1;
size_t parker_uuid_size;
size_t parkee_uuid_size;
/* If there is already a subscription, get rid of it. */
wipe_subscription_datastore(chan);
@ -193,8 +194,11 @@ static int create_parked_subscription_full(struct ast_channel *chan, const char
return -1;
}
parker_uuid_size = strlen(parker_uuid) + 1;
parkee_uuid_size = strlen(parkee_uuid) + 1;
if (!(subscription_data = ast_calloc(1, sizeof(*subscription_data) + parker_uuid_size +
strlen(parkee_uuid) + 1))) {
parkee_uuid_size))) {
ast_datastore_free(datastore);
ast_free(parked_datastore);
return -1;
@ -207,8 +211,7 @@ static int create_parked_subscription_full(struct ast_channel *chan, const char
subscription_data->hangup_after = hangup_after;
subscription_data->parkee_uuid = subscription_data->parker_uuid + parker_uuid_size;
strcpy(subscription_data->parkee_uuid, parkee_uuid);
strcpy(subscription_data->parker_uuid, parker_uuid);
ast_copy_string(subscription_data->parkee_uuid, parkee_uuid, parkee_uuid_size);
if (!(parked_datastore->parked_subscription = stasis_subscribe_pool(ast_parking_topic(), parker_update_cb, subscription_data))) {
return -1;

13
res/res_pjsip_registrar.c
View File

@ -422,12 +422,13 @@ static int registrar_contact_delete(enum contact_delete_type type, pjsip_transpo
aor_size = aor_name ? strlen(aor_name) : 0;
if (contact->prune_on_boot && type != CONTACT_DELETE_SHUTDOWN && aor_size) {
const char *contact_name = ast_sorcery_object_get_id(contact);
size_t contact_name_len = strlen(contact_name) + 1;
struct contact_transport_monitor *monitor = ast_alloca(
sizeof(*monitor) + 2 + aor_size + strlen(contact_name));
sizeof(*monitor) + 1 + aor_size + contact_name_len);
strcpy(monitor->aor_name, aor_name); /* Safe */
monitor->contact_name = monitor->aor_name + aor_size + 1;
strcpy(monitor->contact_name, contact_name); /* Safe */
ast_copy_string(monitor->contact_name, contact_name, contact_name_len); /* Safe */
if (transport) {
ast_sip_transport_monitor_unregister(transport,
@ -774,6 +775,7 @@ static void register_aor_core(pjsip_rx_data *rdata,
}
if (prune_on_boot) {
size_t contact_name_len;
const char *contact_name;
struct contact_transport_monitor *monitor;
@ -782,12 +784,13 @@ static void register_aor_core(pjsip_rx_data *rdata,
* the contact won't be valid anymore if that happens.
*/
contact_name = ast_sorcery_object_get_id(contact);
monitor = ao2_alloc(sizeof(*monitor) + 2 + strlen(aor_name)
+ strlen(contact_name), NULL);
contact_name_len = strlen(contact_name) + 1;
monitor = ao2_alloc(sizeof(*monitor) + 1 + strlen(aor_name)
+ contact_name_len, NULL);
if (monitor) {
strcpy(monitor->aor_name, aor_name);/* Safe */
monitor->contact_name = monitor->aor_name + strlen(aor_name) + 1;
strcpy(monitor->contact_name, contact_name);/* Safe */
ast_copy_string(monitor->contact_name, contact_name, contact_name_len);/* Safe */
ast_sip_transport_monitor_register_replace(rdata->tp_info.transport,
register_contact_transport_shutdown_cb, monitor, contact_transport_monitor_matcher);

12
tests/test_locale.c
View File

@ -98,6 +98,7 @@ static char *handle_cli_test_locales(struct ast_cli_entry *e, int cmd, struct as
ast_strftime(origlocalformat, sizeof(origlocalformat), "%c", &atm);
while ((dent = readdir(localedir))) {
size_t locallen;
size_t namelen;
if (dent->d_name[0] == '.') {
@ -107,14 +108,17 @@ static char *handle_cli_test_locales(struct ast_cli_entry *e, int cmd, struct as
setlocale(LC_ALL, dent->d_name);
ast_strftime(localformat, sizeof(localformat), "%c", &atm);
locallen = strlen(localformat) + 1;
namelen = strlen(dent->d_name) + 1;
/* Store values */
if (!(tl = ast_calloc(1, sizeof(*tl) + strlen(localformat) + (namelen = strlen(dent->d_name)) + 2))) {
if (!(tl = ast_calloc(1, sizeof(*tl) + locallen + namelen))) {
continue;
}
strcpy(tl->name, dent->d_name); /* SAFE */
tl->localformat = tl->name + namelen + 1;
strcpy(tl->localformat, localformat); /* SAFE */
ast_copy_string(tl->name, dent->d_name, namelen); /* SAFE */
tl->localformat = tl->name + namelen;
ast_copy_string(tl->localformat, localformat, locallen); /* SAFE */
AST_LIST_INSERT_TAIL(&locales, tl, list);

2
utils/astman.c
View File

@ -537,7 +537,7 @@ static void try_redirect(newtComponent c)
chan = newtListboxGetCurrent(c);
if (chan) {
strncpy(channame, chan->name, sizeof(channame) - 1);
snprintf(channame, sizeof(channame), "%s", chan->name);
snprintf(tmp, sizeof(tmp), "%s%s", tmp_prefix, channame);
if (get_user_input(tmp, dest, sizeof(dest)))
return;

3
utils/db1-ast/hash/ndbm.c
View File

@ -79,8 +79,7 @@ dbm_open(file, flags, mode)
info.cachesize = 0;
info.hash = NULL;
info.lorder = 0;
(void)strcpy(path, file); /* SAFE */
(void)strncat(path, DBM_SUFFIX, len - strlen(path) - 1);
snprintf(path, len, "%s%s", file, DBM_SUFFIX);
db = (DBM *)__hash_open(path, flags, mode, &info, 0);
#ifndef __GNUC__
free(path);

10
utils/extconf.c
View File

@ -1057,14 +1057,16 @@ static struct ast_variable *ast_variable_new(const char *name, const char *value
{
struct ast_variable *variable;
int name_len = strlen(name) + 1;
size_t value_len = strlen(value) + 1;
size_t filename_len = strlen(filename) + 1;
if ((variable = ast_calloc(1, name_len + strlen(value) + 1 + strlen(filename) + 1 + sizeof(*variable)))) {
if ((variable = ast_calloc(1, name_len + value_len + filename_len + sizeof(*variable)))) {
variable->name = variable->stuff;
variable->value = variable->stuff + name_len;
variable->file = variable->value + strlen(value) + 1;
variable->file = variable->value + value_len;
strcpy(variable->name,name);
strcpy(variable->value,value);
strcpy(variable->file,filename);
ast_copy_string(variable->value, value, value_len);
ast_copy_string(variable->file, filename, filename_len);
}
return variable;

25
utils/muted.c
View File

@ -163,12 +163,12 @@ static int load_config(void)
fprintf(stderr, "host needs an argument (the host) at line %d\n", lineno);
} else if (!strcasecmp(buf, "user")) {
if (val && strlen(val))
strncpy(user, val, sizeof(user) - 1);
snprintf(user, sizeof(user), "%s", val);
else
fprintf(stderr, "user needs an argument (the user) at line %d\n", lineno);
} else if (!strcasecmp(buf, "pass")) {
if (val && strlen(val))
strncpy(pass, val, sizeof(pass) - 1);
snprintf(pass, sizeof(pass), "%s", val);
else
fprintf(stderr, "pass needs an argument (the password) at line %d\n", lineno);
} else if (!strcasecmp(buf, "smoothfade")) {
@ -639,24 +639,29 @@ static int wait_event(void)
return -1;
}
if (!strncasecmp(resp, "Event: ", strlen("Event: "))) {
strncpy(event, resp + strlen("Event: "), sizeof(event) - 1);
int event_len = -1;
int channel_len = -1;
int newname_len = -1;
int oldname_len = -1;
event_len = snprintf(event, sizeof(event), "%s", resp + strlen("Event: "));
/* Consume the rest of the non-event */
while((resp = get_line()) && strlen(resp)) {
if (!strncasecmp(resp, "Channel: ", strlen("Channel: ")))
strncpy(channel, resp + strlen("Channel: "), sizeof(channel) - 1);
channel_len = snprintf(channel, sizeof(channel), "%s", resp + strlen("Channel: "));
if (!strncasecmp(resp, "Newname: ", strlen("Newname: ")))
strncpy(newname, resp + strlen("Newname: "), sizeof(newname) - 1);
newname_len = snprintf(newname, sizeof(newname), "%s", resp + strlen("Newname: "));
if (!strncasecmp(resp, "Oldname: ", strlen("Oldname: ")))
strncpy(oldname, resp + strlen("Oldname: "), sizeof(oldname) - 1);
oldname_len = snprintf(oldname, sizeof(oldname), "%s", resp + strlen("Oldname: "));
}
if (strlen(channel)) {
if (!strcasecmp(event, "Hangup"))
if (channel_len == strlen(channel)) {
if (event_len == strlen(event) && !strcasecmp(event, "Hangup"))
hangup_chan(channel);
else
offhook_chan(channel);
}
if (strlen(newname) && strlen(oldname)) {
if (!strcasecmp(event, "Rename")) {
if (newname_len == strlen(newname) && oldname_len == strlen(oldname)) {
if (event_len == strlen(event) && !strcasecmp(event, "Rename")) {
hangup_chan(oldname);
offhook_chan(newname);
}