Author: ngie
Date: Mon Mar 27 18:26:22 2017
New Revision: 316044
URL: https://svnweb.freebsd.org/changeset/base/316044
Log:
MFC r315641,r315642:
r315641:
bsnmp: don't leak snmp_client.fd in open_client_udp(..) on connect(2) failure
r315642:
bsnmp: explicitly test the return value for open_client_{local,udp} in
snmp_open(..)
open_client_* returns -1 on failure; 0 on success. Ensure that the return
value is
0 -- otherwise exit snmp_open(..).
Modified:
stable/10/contrib/bsnmp/lib/snmpclient.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/bsnmp/lib/snmpclient.c
==============================================================================
--- stable/10/contrib/bsnmp/lib/snmpclient.c Mon Mar 27 18:26:19 2017
(r316043)
+++ stable/10/contrib/bsnmp/lib/snmpclient.c Mon Mar 27 18:26:22 2017
(r316044)
@@ -947,6 +947,8 @@ open_client_udp(const char *host, const
if ((res = res->ai_next) == NULL) {
seterr(&snmp_client, "%s", strerror(errno));
freeaddrinfo(res0);
+ (void)close(snmp_client.fd);
+ snmp_client.fd = -1;
return (-1);
}
} else
@@ -1066,13 +1068,13 @@ snmp_open(const char *host, const char *
switch (snmp_client.trans) {
case SNMP_TRANS_UDP:
- if (open_client_udp(host, port))
+ if (open_client_udp(host, port) != 0)
return (-1);
break;
case SNMP_TRANS_LOC_DGRAM:
case SNMP_TRANS_LOC_STREAM:
- if (open_client_local(host))
+ if (open_client_local(host) != 0)
return (-1);
break;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
