Skip to content

Commit 6a9b6a3

Browse files
fix several uninitialized variable warnings (#7087)
Initialize structs as appropriate in PXO and mdns code that were reported by gcc/clang/coverity.
1 parent ea985b6 commit 6a9b6a3

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

code/network/multi_mdns.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ static int service_callback(int sock, const struct sockaddr* from, size_t addrle
7272
const SCP_string HOSTNAME_QUALIFIED = HOST_NAME + ".local.";
7373

7474
std::array<char, 256> NAME{};
75-
mdns_record_t answer;
75+
mdns_record_t answer{};
7676
SCP_vector<mdns_record_t> records;
77-
mdns_record_t n_record;
77+
mdns_record_t n_record{};
7878

7979
answer.type = MDNS_RECORDTYPE_IGNORE;
8080

@@ -112,6 +112,7 @@ static int service_callback(int sock, const struct sockaddr* from, size_t addrle
112112

113113
// add A record
114114
if (has_ipv4) {
115+
n_record = {};
115116
n_record.name = { HOSTNAME_QUALIFIED.c_str(), HOSTNAME_QUALIFIED.length() };
116117
n_record.type = MDNS_RECORDTYPE_A;
117118
n_record.data.a.addr = IPv4_addr;
@@ -121,6 +122,7 @@ static int service_callback(int sock, const struct sockaddr* from, size_t addrle
121122

122123
// add AAAA record
123124
if (has_ipv6) {
125+
n_record = {};
124126
n_record.name = { HOSTNAME_QUALIFIED.c_str(), HOSTNAME_QUALIFIED.length() };
125127
n_record.type = MDNS_RECORDTYPE_AAAA;
126128
n_record.data.aaaa.addr = IPv6_addr;
@@ -145,6 +147,7 @@ static int service_callback(int sock, const struct sockaddr* from, size_t addrle
145147

146148
// add A record
147149
if (has_ipv4) {
150+
n_record = {};
148151
n_record.name = { HOSTNAME_QUALIFIED.c_str(), HOSTNAME_QUALIFIED.length() };
149152
n_record.type = MDNS_RECORDTYPE_A;
150153
n_record.data.a.addr = IPv4_addr;
@@ -154,6 +157,7 @@ static int service_callback(int sock, const struct sockaddr* from, size_t addrle
154157

155158
// add AAAA record
156159
if (has_ipv6) {
160+
n_record = {};
157161
n_record.name = { HOSTNAME_QUALIFIED.c_str(), HOSTNAME_QUALIFIED.length() };
158162
n_record.type = MDNS_RECORDTYPE_AAAA;
159163
n_record.data.aaaa.addr = IPv6_addr;
@@ -174,6 +178,7 @@ static int service_callback(int sock, const struct sockaddr* from, size_t addrle
174178

175179
// add AAAA record
176180
if (has_ipv6) {
181+
n_record = {};
177182
n_record.name = { HOSTNAME_QUALIFIED.c_str(), HOSTNAME_QUALIFIED.length() };
178183
n_record.type = MDNS_RECORDTYPE_AAAA;
179184
n_record.data.aaaa.addr = IPv6_addr;
@@ -190,6 +195,7 @@ static int service_callback(int sock, const struct sockaddr* from, size_t addrle
190195

191196
// add A record
192197
if (has_ipv4) {
198+
n_record = {};
193199
n_record.name = { HOSTNAME_QUALIFIED.c_str(), HOSTNAME_QUALIFIED.length() };
194200
n_record.type = MDNS_RECORDTYPE_A;
195201
n_record.data.a.addr = IPv4_addr;

code/network/valid.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ void ValidIdle()
543543
//Send an ACK to the server
544544
void AckValidServer(unsigned int sig)
545545
{
546-
udp_packet_header ack_pack;
546+
udp_packet_header ack_pack{};
547547
ubyte packet_data[sizeof(udp_packet_header)];
548548
int packet_length = 0;
549549

0 commit comments

Comments
 (0)