[sr-dev] git:master:2654fbb0: core: handle error case also for socket fd 0

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 2654fbb0c02fd8df82ecd6b8514e031952997104
URL: https://github.com/kamailio/kamailio/commit/2654fbb0c02fd8df82ecd6b8514e031952997104

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2017-07-17T07:55:36+02:00

core: handle error case also for socket fd 0

- avoid fd leak warnings by code analyzer

---

Modified: src/core/socket_info.c

---

Diff:  https://github.com/kamailio/kamailio/commit/2654fbb0c02fd8df82ecd6b8514e031952997104.diff
Patch: https://github.com/kamailio/kamailio/commit/2654fbb0c02fd8df82ecd6b8514e031952997104.patch

---

diff --git a/src/core/socket_info.c b/src/core/socket_info.c
index 1544ec4cbd..dd5a13bc60 100644
--- a/src/core/socket_info.c
+++ b/src/core/socket_info.c
@@ -882,7 +882,7 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
 
 static int nl_bound_sock(void)
 {
-	int sock;
+	int sock = -1;
 	struct sockaddr_nl la;
 
 	sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
@@ -904,7 +904,7 @@ static int nl_bound_sock(void)
 
 	return sock;
 error:
-	if(sock > 0) close(sock);
+	if(sock >= 0) close(sock);
 	return -1;
 }
 
@@ -930,7 +930,7 @@ static int get_flags(int family){
 	char buf[8192];
 	char *p = buf;
 	int nll = 0;
-        int nl_sock = 0;
+    int nl_sock = -1;
 
 	fill_nl_req(req, RTM_GETLINK, AF_INET);
 
@@ -977,11 +977,11 @@ static int get_flags(int family){
 		ifaces[ifi->ifi_index].flags = ifi->ifi_flags;
 	}
 
-	if(nl_sock>0) close(nl_sock);
+	if(nl_sock>=0) close(nl_sock);
 	return 0;
 
 error:
-	if(nl_sock>0) close(nl_sock);
+	if(nl_sock>=0) close(nl_sock);
 	return -1;
 }
 
@@ -1004,9 +1004,9 @@ static int build_iface_list(void)
 	int index, i;
 	struct idx* entry;
 	struct idx* tmp;
-        int nl_sock = 0;
-        int families[] = {AF_INET, AF_INET6};
-        char name[MAX_IF_LEN];
+	int nl_sock = -1;
+	int families[] = {AF_INET, AF_INET6};
+	char name[MAX_IF_LEN];
 	int is_link_local = 0;
 
 	if(ifaces == NULL){
@@ -1137,7 +1137,7 @@ static int build_iface_list(void)
 
 	return 0;
 error:
-	if(nl_sock>0) close(nl_sock);
+	if(nl_sock>=0) close(nl_sock);
 	return -1;
 
 }