kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-24 05:38:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compiler fixes for gcc 10

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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);