kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #394 from signalwire/sres 

[sofia-sip] Guard `if` in sres_record_compare() and fix braces in sres_resolver_receive().
This commit is contained in:
Andrey Volk 2020-02-20 20:08:07 +04:00 committed by GitHub
parent 17996ad6b2 022efe3388
commit 7b708c2c77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Wed Feb 19 22:50:10 UTC 2020
Thu Feb 20 10:09:05 UTC 2020

5
libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
View File

@ -1640,7 +1640,8 @@ sres_record_compare(sres_record_t const *aa, sres_record_t const *bb)
D = A->a6_prelen - B->a6_prelen; if (D) return D;
D = !A->a6_prename - !B->a6_prename;
if (D == 0 && A->a6_prename && B->a6_prename)
D = su_strcasecmp(A->a6_prename, B->a6_prename); if (D) return D;
D = su_strcasecmp(A->a6_prename, B->a6_prename);
if (D) return D;
return memcmp(&A->a6_suffix, &B->a6_suffix, sizeof A->a6_suffix);
}
case sres_type_aaaa:
@ -3460,7 +3461,7 @@ sres_resolver_receive(sres_resolver_t *res, int socket)
sres_record_t **reply;
sres_server_t *dns;
struct sockaddr_storage from[1] = { 0 };
struct sockaddr_storage from[1] = {{0}};
socklen_t fromlen = sizeof from;
SU_DEBUG_9(("%s(%p, %u) called\n", "sres_resolver_receive",