mirror of
https://github.com/espressif/esp-protocols.git
synced 2025-07-31 03:07:30 +02:00
Merge pull request #642 from david-cermak/fix/mdns_coverity
[mdns]: Fix recent issues on v1.4 reported by Coverity
This commit is contained in:
@ -5956,11 +5956,6 @@ static mdns_txt_item_t *_copy_mdns_txt_items(mdns_txt_linked_item_t *items, uint
|
|||||||
for (mdns_txt_linked_item_t *tmp = items; tmp != NULL; tmp = tmp->next) {
|
for (mdns_txt_linked_item_t *tmp = items; tmp != NULL; tmp = tmp->next) {
|
||||||
ret_index++;
|
ret_index++;
|
||||||
}
|
}
|
||||||
if (ret_index == 0) {
|
|
||||||
*txt_count = 0;
|
|
||||||
*txt_value_len = NULL;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
*txt_count = ret_index;
|
*txt_count = ret_index;
|
||||||
if (ret_index == 0) { // handle empty TXT
|
if (ret_index == 0) { // handle empty TXT
|
||||||
*txt_value_len = NULL;
|
*txt_value_len = NULL;
|
||||||
@ -6403,22 +6398,14 @@ esp_err_t mdns_service_remove_for_host(const char *instance, const char *service
|
|||||||
if (_mdns_service_match(a->service, service, proto, hostname)) {
|
if (_mdns_service_match(a->service, service, proto, hostname)) {
|
||||||
if (_mdns_server->services != a) {
|
if (_mdns_server->services != a) {
|
||||||
b->next = a->next;
|
b->next = a->next;
|
||||||
_mdns_send_bye(&a, 1, false);
|
|
||||||
_mdns_remove_scheduled_service_packets(a->service);
|
|
||||||
_mdns_free_service(a->service);
|
|
||||||
free(a);
|
|
||||||
a = b->next;
|
|
||||||
continue;
|
|
||||||
} else {
|
} else {
|
||||||
_mdns_server->services = a->next;
|
_mdns_server->services = a->next;
|
||||||
_mdns_send_bye(&a, 1, false);
|
|
||||||
_mdns_remove_scheduled_service_packets(a->service);
|
|
||||||
_mdns_free_service(a->service);
|
|
||||||
free(a);
|
|
||||||
a = _mdns_server->services;
|
|
||||||
b = a;
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
_mdns_send_bye(&a, 1, false);
|
||||||
|
_mdns_remove_scheduled_service_packets(a->service);
|
||||||
|
_mdns_free_service(a->service);
|
||||||
|
free(a);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
b = a;
|
b = a;
|
||||||
a = a->next;
|
a = a->next;
|
||||||
|
Reference in New Issue
Block a user