Procházet zdrojové kódy

cdp: close socket in case of error

Daniel-Constantin Mierla před 3 roky
rodič
revize
993c036bb1
1 změnil soubory, kde provedl 5 přidání a 2 odebrání
  1. 5 2
      src/modules/cdp/receiver.c

+ 5 - 2
src/modules/cdp/receiver.c

@@ -844,7 +844,7 @@ drop_peer:
  */
 int peer_connect(peer *p)
 {
-	int sock;
+	int sock = -1;
 	int tmp = 0;
 	unsigned int option = 1;
 
@@ -922,17 +922,20 @@ int peer_connect(peer *p)
 						if (valopt) {
 							LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(valopt));
 							close(sock);
+							sock = -1;
 							continue;
 						}
 					}else{
 						LM_ERR("peer_connect(): Timeout or error opening connection to to %s port %s >%s\n",host,serv,strerror(errno));
 						close(sock);
+						sock = -1;
 						continue;
 					}
 				}
 			}else{
 				LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(errno));
 				close(sock);
+				sock = -1;
 				continue;
 			}
 
@@ -956,7 +959,6 @@ int peer_connect(peer *p)
 
 		if (!send_fd(p->fd_exchange_pipe,sock,p)){
 			LM_ERR("peer_connect(): [%.*s] Error sending fd to respective receiver\n",p->fqdn.len,p->fqdn.s);
-			close(sock);
 			goto error;
 		}
 
@@ -967,6 +969,7 @@ int peer_connect(peer *p)
 error:
 	if (res) freeaddrinfo(res);
 	if (sainfo) freeaddrinfo(sainfo);
+	if (sock!=-1) close(sock);
 	return -1;
 }