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

Use strdup instead of malloc + strlcpy

Browse Source 
Fix error messages on failure for calloc/strdup

MFC after: 3 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2016-05-15 00:25:36 +00:00
parent 229bb4daa1
commit 27c7c23864
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
View File

@ -763,17 +763,16 @@ snmp_import_object(struct snmp_toolinfo *snmptoolctx)
return (-1);
if ((oid2str = calloc(1, sizeof(struct snmp_oid2str))) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
syslog(LOG_ERR, "calloc() failed: %s", strerror(errno));
return (-1);
}
if ((string = malloc(strlen(nexttok) + 1)) == NULL) {
syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
if ((string = strdup(nexttok)) == NULL) {
syslog(LOG_ERR, "strdup() failed: %s", strerror(errno));
free(oid2str);
return (-1);
}
strlcpy(string, nexttok, nitems(string));
oid2str->string = string;
oid2str->strlen = strlen(nexttok);