Skip to content

Commit a1c8277

Browse files
author
Arto Kinnunen
authored
Merge pull request ARMmbed#1978 from ARMmbed/IOTTHD-3219
Fix issues found by Coverity
2 parents 5fe7120 + 62f8b41 commit a1c8277

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

source/6LoWPAN/Thread/thread_extension_bbr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ static int thread_border_router_pbbr_nw_data_register(thread_pbbr_t *this)
10871087
return -1;
10881088
}
10891089

1090-
if (!addr_is_ipv6_unspecified(this->domain_prefix)) {
1090+
if (memcmp(this->domain_prefix, ADDR_UNSPECIFIED, 8) != 0) {
10911091
thread_border_router_info_t br_info = {0};
10921092
br_info.P_on_mesh = true;
10931093
br_info.stableData = true;
@@ -1443,7 +1443,7 @@ int thread_extension_bbr_prefix_set(int8_t interface_id, uint8_t *prefix)
14431443
return 0;
14441444
}
14451445

1446-
if (!addr_is_ipv6_unspecified(this->domain_prefix)) {
1446+
if (memcmp(this->domain_prefix, ADDR_UNSPECIFIED, 8) != 0) {
14471447
thread_border_router_info_t br_info = {0};
14481448
br_info.P_on_mesh = true;
14491449
br_info.stableData = true;

source/6LoWPAN/Thread/thread_host_bootstrap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,9 @@ static bool thread_host_prefer_parent_response(protocol_interface_info_entry_t *
470470
{
471471
(void) connectivity;
472472
(void) cur;
473+
bool cur_version = thread_extension_version_check(thread_info(cur)->version);
473474

474-
if (!thread_extension_version_check(thread_info(cur)->version)) {
475+
if (!cur_version) {
475476
return false;
476477
}
477478

source/6LoWPAN/Thread/thread_management_if.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1370,14 +1370,16 @@ int thread_management_network_certificate_set(int8_t interface_id, const unsigne
13701370
{
13711371
#ifdef HAVE_THREAD
13721372
protocol_interface_info_entry_t *cur;
1373+
int ret_val;
13731374

13741375
cur = protocol_stack_interface_info_get_by_id(interface_id);
13751376
if (!cur) {
13761377
tr_debug("invalid interface id");
13771378
return -1;
13781379
}
13791380

1380-
if (0 > thread_extension_bootstrap_network_certificate_set(cur, network_certificate_ptr, network_certificate_len)) {
1381+
ret_val = thread_extension_bootstrap_network_certificate_set(cur, network_certificate_ptr, network_certificate_len);
1382+
if (0 > ret_val) {
13811383
return -1;
13821384
}
13831385

0 commit comments

Comments
 (0)