From ea622e211e35b3bdf2779ee00fc2a430a3efb37b Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Sat, 26 Mar 2016 11:32:48 +0000 Subject: [PATCH] NULL-values are compared correctly. FossilOrigin-Name: 4094a71e1101a2d7032763ed882738d5ea770e71d474ea0c80122166e3f8563d --- src/cw/sock_cmpaddr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/cw/sock_cmpaddr.c b/src/cw/sock_cmpaddr.c index 07ff8581..bd425481 100644 --- a/src/cw/sock_cmpaddr.c +++ b/src/cw/sock_cmpaddr.c @@ -47,14 +47,17 @@ int sock_cmpaddr(const struct sockaddr *addr1, const struct sockaddr *addr2,int int p1,p2; int slen; - if (!addr1){ + if (!addr1 && addr2){ return -1; } - if (!addr2){ - return -1; + if (!addr2 && addr1){ + return 1; } + if (!addr1 && !addr2) + return 0; + if (addr1->sa_family != addr2->sa_family){ return addr1->sa_family - addr2->sa_family; }