d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use calloc instead of malloc with buffers in snmp_{recv,send}_packet

Browse Source 
This doesn't fix the issue noted in the PR, but at the very least it
cleans up the error so it looks a bit more sane, and in the event
that bsnmp did wander off into the weeds, the likelihood of it
crashing with more sensible output is greater, in my opinion

MFC counter set high so I have enough time to resolve the real
underlying bug in bsnmpwalk

MFC after:	1 month
PR:		215721
This commit is contained in:
ngie 2017-01-04 07:53:01 +00:00
parent f6070c3dd8
commit ec5e0f180c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/bsnmp/lib/snmpclient.c
View File

@ -1231,7 +1231,7 @@ snmp_send_packet(struct snmp_pdu * pdu)
struct asn_buf b;
ssize_t ret;
if ((buf = malloc(snmp_client.txbuflen)) == NULL) {
if ((buf = calloc(1, snmp_client.txbuflen)) == NULL) {
seterr(&snmp_client, "%s", strerror(errno));
return (-1);
}
@ -1256,7 +1256,7 @@ snmp_send_packet(struct snmp_pdu * pdu)
}
free(buf);
return pdu->request_id;
return (pdu->request_id);
}
/*
@ -1352,7 +1352,7 @@ snmp_receive_packet(struct snmp_pdu *pdu, struct timeval *tv)
socklen_t optlen;
#endif
if ((buf = malloc(snmp_client.rxbuflen)) == NULL) {
if ((buf = calloc(1, snmp_client.rxbuflen)) == NULL) {
seterr(&snmp_client, "%s", strerror(errno));
return (-1);
}