kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

gcc14: Fix issues caught by gcc 14

Browse Source 
* reqresp_parser.c: Fix misuse of "static" with linked list definitions
* test_message.c: Fix segfaults caused by passing NULL as an sprintf fmt

(cherry picked from commit d80361d6de)
This commit is contained in:
George Joseph
2025-01-03 14:39:52 -07:00
committed by Asterisk Development Team
parent c53acca6ab
commit 3c5c986d76
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/sip/reqresp_parser.c
View File

@@ -280,7 +280,7 @@ AST_TEST_DEFINE(sip_parse_uri_full_test)
struct testdata *testdataptr; struct testdata *testdataptr;
static AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist; AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist;
struct testdata td1 = { struct testdata td1 = {
.desc = "no headers", .desc = "no headers",
@@ -1327,7 +1327,7 @@ AST_TEST_DEFINE(parse_name_andor_addr_test)
struct testdata *testdataptr; struct testdata *testdataptr;
static AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist; AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist;
struct testdata td1 = { struct testdata td1 = {
.desc = "quotes and brackets", .desc = "quotes and brackets",
@@ -1553,7 +1553,7 @@ AST_TEST_DEFINE(parse_contact_header_test)
struct contact *tdcontactptr; struct contact *tdcontactptr;
struct contact *contactptr; struct contact *contactptr;
static AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist; AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist;
struct contactliststruct contactlist1, contactlist2; struct contactliststruct contactlist1, contactlist2;
struct testdata td1 = { struct testdata td1 = {
@@ -1776,7 +1776,7 @@ AST_TEST_DEFINE(sip_parse_options_test)
}; };
struct testdata *testdataptr; struct testdata *testdataptr;
static AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist; AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist;
struct testdata test1 = { struct testdata test1 = {
.name = "test_all_unsupported", .name = "test_all_unsupported",
@@ -2476,7 +2476,7 @@ AST_TEST_DEFINE(parse_via_test)
AST_LIST_ENTRY(testdata) list; AST_LIST_ENTRY(testdata) list;
}; };
struct testdata *testdataptr; struct testdata *testdataptr;
static AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist; AST_LIST_HEAD_NOLOCK(testdataliststruct, testdata) testdatalist;
struct testdata t1 = { struct testdata t1 = {
.in = "SIP/2.0/UDP host:port;branch=thebranch", .in = "SIP/2.0/UDP host:port;branch=thebranch",
.expected_protocol = "SIP/2.0/UDP", .expected_protocol = "SIP/2.0/UDP",

10
tests/test_message.c
View File

@@ -680,10 +680,10 @@ AST_TEST_DEFINE(test_message_has_destination_dialplan)
ast_msg_set_exten(msg, "__I_SHOULD_NOT_EXIST_PLZ__"); ast_msg_set_exten(msg, "__I_SHOULD_NOT_EXIST_PLZ__");
ast_test_validate(test, ast_msg_has_destination(msg) == 0); ast_test_validate(test, ast_msg_has_destination(msg) == 0);
ast_msg_set_exten(msg, NULL); ast_msg_set_exten(msg, "%s", "");
ast_test_validate(test, ast_msg_has_destination(msg) == 0); ast_test_validate(test, ast_msg_has_destination(msg) == 0);
ast_msg_set_context(msg, NULL); ast_msg_set_context(msg, "%s", "");
ast_msg_set_exten(msg, TEST_EXTENSION); ast_msg_set_exten(msg, TEST_EXTENSION);
ast_test_validate(test, ast_msg_has_destination(msg) == 0); ast_test_validate(test, ast_msg_has_destination(msg) == 0);
@@ -716,10 +716,10 @@ AST_TEST_DEFINE(test_message_has_destination_handler)
ast_msg_set_to(msg, "foo"); ast_msg_set_to(msg, "foo");
ast_msg_set_context(msg, TEST_CONTEXT); ast_msg_set_context(msg, TEST_CONTEXT);
ast_msg_set_exten(msg, NULL); ast_msg_set_exten(msg, "%s", "");
ast_test_validate(test, ast_msg_has_destination(msg) == 1); ast_test_validate(test, ast_msg_has_destination(msg) == 1);
ast_msg_set_context(msg, NULL); ast_msg_set_context(msg, "%s", "");
ast_test_validate(test, ast_msg_has_destination(msg) == 1); ast_test_validate(test, ast_msg_has_destination(msg) == 1);
ast_msg_set_to(msg, "__I_SHOULD_NOT_EXIST_PLZ__"); ast_msg_set_to(msg, "__I_SHOULD_NOT_EXIST_PLZ__");
@@ -756,7 +756,7 @@ AST_TEST_DEFINE(test_message_msg_send)
ast_msg_set_to(msg, "foo"); ast_msg_set_to(msg, "foo");
ast_msg_set_context(msg, TEST_CONTEXT); ast_msg_set_context(msg, TEST_CONTEXT);
ast_msg_set_exten(msg, NULL); ast_msg_set_exten(msg, "%s", "");
ast_test_validate(test, ast_msg_has_destination(msg) == 1); ast_test_validate(test, ast_msg_has_destination(msg) == 1);
if (!ast_msg_send(msg, "testmsg:foo", "blah")) { if (!ast_msg_send(msg, "testmsg:foo", "blah")) {