espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/mdns_txt_length_collision_v4.2' into 'release/v4.2'

Browse Source 
mDNS: Fix of text length calculation when detecting a collision(Backport v4.2)

See merge request espressif/esp-idf!12029
This commit is contained in:
David Čermák
2021-01-19 22:15:05 +08:00
parent db2ddebc23 500edd412a
commit ad47ed5ef1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/mdns/mdns.c
View File

@ -2147,7 +2147,7 @@ static int _mdns_check_srv_collision(mdns_service_t * service, uint16_t priority
*/ */
static int _mdns_check_txt_collision(mdns_service_t * service, const uint8_t * data, size_t len) static int _mdns_check_txt_collision(mdns_service_t * service, const uint8_t * data, size_t len)
{ {
size_t data_len = 1; size_t data_len = 0;
if (len == 1 && service->txt) { if (len == 1 && service->txt) {
return -1;//we win return -1;//we win
} else if (len > 1 && !service->txt) { } else if (len > 1 && !service->txt) {
@ -2158,7 +2158,7 @@ static int _mdns_check_txt_collision(mdns_service_t * service, const uint8_t * d
mdns_txt_linked_item_t * txt = service->txt; mdns_txt_linked_item_t * txt = service->txt;
while (txt) { while (txt) {
data_len += 2 + strlen(service->txt->key) + strlen(service->txt->value); data_len += 2 + strlen(txt->key) + strlen(txt->value);
txt = txt->next; txt = txt->next;
} }