Skip to content

Commit 571a741

Browse files
authored
Merge pull request #642 from david-cermak/fix/mdns_coverity
[mdns]: Fix recent issues on v1.4 reported by Coverity
2 parents 73c4830 + 25b3d5f commit 571a741

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

components/mdns/mdns.c

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5956,11 +5956,6 @@ static mdns_txt_item_t *_copy_mdns_txt_items(mdns_txt_linked_item_t *items, uint
59565956
for (mdns_txt_linked_item_t *tmp = items; tmp != NULL; tmp = tmp->next) {
59575957
ret_index++;
59585958
}
5959-
if (ret_index == 0) {
5960-
*txt_count = 0;
5961-
*txt_value_len = NULL;
5962-
return NULL;
5963-
}
59645959
*txt_count = ret_index;
59655960
if (ret_index == 0) { // handle empty TXT
59665961
*txt_value_len = NULL;
@@ -6403,22 +6398,14 @@ esp_err_t mdns_service_remove_for_host(const char *instance, const char *service
64036398
if (_mdns_service_match(a->service, service, proto, hostname)) {
64046399
if (_mdns_server->services != a) {
64056400
b->next = a->next;
6406-
_mdns_send_bye(&a, 1, false);
6407-
_mdns_remove_scheduled_service_packets(a->service);
6408-
_mdns_free_service(a->service);
6409-
free(a);
6410-
a = b->next;
6411-
continue;
64126401
} else {
64136402
_mdns_server->services = a->next;
6414-
_mdns_send_bye(&a, 1, false);
6415-
_mdns_remove_scheduled_service_packets(a->service);
6416-
_mdns_free_service(a->service);
6417-
free(a);
6418-
a = _mdns_server->services;
6419-
b = a;
6420-
continue;
64216403
}
6404+
_mdns_send_bye(&a, 1, false);
6405+
_mdns_remove_scheduled_service_packets(a->service);
6406+
_mdns_free_service(a->service);
6407+
free(a);
6408+
break;
64226409
}
64236410
b = a;
64246411
a = a->next;

0 commit comments

Comments
 (0)